Fixing UI crash.

commschamp · Nov 14, 2024 · 1ea4f0e · 1ea4f0e
1 parent 2d38361
commit 1ea4f0e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/app/cc_view/src/widget/DefaultMessageWidget.cpp b/app/cc_view/src/widget/DefaultMessageWidget.cpp
@@ -92,12 +92,12 @@ std::unique_ptr<QFrame> DefaultMessageWidget::createFieldSeparator()
     return line;
 }
 
-void DefaultMessageWidget::connectFieldSignals(FieldWidget* field)
+void DefaultMessageWidget::connectFieldSignals(FieldWidget* fieldWidget)
 {
-    assert(field != nullptr);
-    connect(this, SIGNAL(sigRefreshFields()), field, SLOT(refresh()));
-    connect(this, SIGNAL(sigSetEditEnabled(bool)), field, SLOT(setEditEnabled(bool)));
-    connect(field, SIGNAL(sigFieldUpdated()), this, SIGNAL(sigMsgUpdated()));
+    assert(fieldWidget != nullptr);
+    connect(this, SIGNAL(sigRefreshFields()), fieldWidget, SLOT(refresh()));
+    connect(this, SIGNAL(sigSetEditEnabled(bool)), fieldWidget, SLOT(setEditEnabled(bool)));
+    connect(fieldWidget, SIGNAL(sigFieldUpdated()), this, SIGNAL(sigMsgUpdated()));
 }
 
 }  // namespace cc_tools_qt

diff --git a/app/cc_view/src/widget/MessageUpdateDialog.cpp b/app/cc_view/src/widget/MessageUpdateDialog.cpp
@@ -324,20 +324,17 @@ void MessageUpdateDialog::msgUpdated()
     bool forceUpdate = (status == ToolsProtocol::UpdateStatus::Changed);
     assert(m_msgDisplayWidget);
 
-    m_msgDisplayWidget->displayMessage(std::move(msg), forceUpdate);
-    return;
-
     // Direct invocation of m_msgDisplayWidget->displayMessage(std::move(msg))
     // in place here causes SIGSEGV. No idea why.
 
-    // QMetaObject::invokeMethod(
-    //     this,
-    //     [this, msgParam = std::move(msg, forceUpdate)]()
-    //     {
-    //         displayMessagePostponed(std::move(msgParam), forceUpdate);
-    //     },
-    //     Qt::QueuedConnection
-    // );
+    QMetaObject::invokeMethod(
+        this,
+        [this, msgParam = msg, forceUpdate]()
+        {
+            displayMessagePostponed(std::move(msgParam), forceUpdate);
+        },
+        Qt::QueuedConnection
+    );
 }
 
 void MessageUpdateDialog::newItemSelected()

diff --git a/app/cc_view/src/widget/RightPaneWidget.cpp b/app/cc_view/src/widget/RightPaneWidget.cpp
@@ -59,6 +59,7 @@ void RightPaneWidget::displayMessage(ToolsMessagePtr msg)
 
 void RightPaneWidget::displayMessagePostponed(ToolsMessagePtr msg, bool force)
 {
+    assert(m_displayWidget != nullptr);
     m_displayWidget->displayMessage(msg, force);
 }
 
@@ -73,10 +74,12 @@ void RightPaneWidget::msgUpdated()
     // in place here causes SIGSEGV. No idea why.
     QMetaObject::invokeMethod(
         this,
-        "displayMessagePostponed",
-        Qt::QueuedConnection,
-        Q_ARG(cc_tools_qt::ToolsMessagePtr, m_displayedMsg),
-        Q_ARG(bool, forceUpdate));    
+        [this, msgParam = m_displayedMsg, forceUpdate]()
+        {
+            displayMessagePostponed(std::move(msgParam), forceUpdate);
+        },
+        Qt::QueuedConnection
+    );    
 }
 
 }  // namespace cc_tools_qt

diff --git a/demo/protocol/include/demo/Frame.h b/demo/protocol/include/demo/Frame.h
@@ -130,7 +130,7 @@ class MsgIdField : public
 
     static const char* name()
     {
-        return "field4";
+        return "ID";
     }      
 
     static const char* valueName(ValueType val)