Merge branch 'fix/reload-on-property-edit' into 'master'

ScenarioManager: Fix reload on property edit

See merge request !101

source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp

@@ -1049,8 +1049,10 @@ DetailedApplicationView::on_fileUpdate()
             lastAppInstance->save();
         }
 
-
+        // we want to ignore any file changes made by us to avoid unnecessarily updating the GUI
+        ignoreFileChanges = true;
         emit saveScenario(lastAppInstance);
+        ignoreFileChanges = false;
     }
     else if (lastScenario.get() != nullptr)
     {
@@ -1097,6 +1099,12 @@ DetailedApplicationView::on_makeLocalButton_clicked()
 void
 DetailedApplicationView::on_fileWatcherUpdate(const QString& path)
 {
+    if (ignoreFileChanges)
+    {
+        ARMARX_VERBOSE << "Ignoring file change from: " << path.toStdString();
+        return;
+    }
+
     ARMARX_VERBOSE << "File changed: " << path.toStdString() << " -> reloading config";
 
     if (lastAppInstance.get() != nullptr)

source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h

@@ -155,6 +155,7 @@ private:
     QTimer updateTimer;
 
     QFileSystemWatcher fileSystemWatcher;
+    bool ignoreFileChanges = false;
 };
 
 using DetailedApplicationViewPtr = std::shared_ptr<DetailedApplicationView>;