Another attempt to fix commsdsl2tools_qt protocol configuration parsing.

commschamp · Feb 25, 2024 · 7383e6d · 7383e6d
1 parent b993c53
commit 7383e6d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp b/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp
@@ -143,13 +143,8 @@ const std::string& ToolsQtGenerator::toolsMinCcToolsQtVersion()
 bool ToolsQtGenerator::prepareImpl() 
 {
     chooseProtocolSchema();
-    bool result = 
-        Base::prepareImpl() &&
-        toolsPrepareDefaultInterfaceInternal() &&
-        toolsPrepareSelectedInterfacesInternal() &&
-        toolsPrepareSelectedFramesInternal();
-
-    if (!result) {
+    if ((!Base::prepareImpl()) || 
+        (!toolsPrepareDefaultInterfaceInternal())) {
         return false;
     }
 
@@ -192,6 +187,14 @@ bool ToolsQtGenerator::prepareImpl()
         m_plugins.push_back(std::make_unique<ToolsQtPlugin>(*this, info.m_frame, info.m_interface, info.m_name, info.m_desc));
     }
 
+    bool result = 
+        toolsPrepareSelectedInterfacesInternal() &&
+        toolsPrepareSelectedFramesInternal();
+
+    if (!result) {
+        return false;
+    }
+
     return 
         std::all_of(
             m_plugins.begin(), m_plugins.end(),