Skip to content
Snippets Groups Projects

ScenarioManager: Fix reload on property edit

Merged Tobias Gröger requested to merge fix/reload-on-property-edit into master
2 files
+ 10
1
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -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)
Loading