#5632: Catch exceptions thrown by actions

codereader · May 29, 2021 · ffb6f87 · ffb6f87
1 parent a8bee01
commit ffb6f87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/libs/scene/merge/MergeOperation.cpp b/libs/scene/merge/MergeOperation.cpp
@@ -90,7 +90,14 @@ void MergeOperation::applyActions()
 {
     for (auto& action : _actions)
     {
-        action->applyChanges();
+        try
+        {
+            action->applyChanges();
+        }
+        catch (const std::runtime_error& ex)
+        {
+            rError() << "Failed to apply action: " << ex.what() << std::endl;
+        }
     }
 }
 

diff --git a/radiant/ui/merge/MergeControlDialog.h b/radiant/ui/merge/MergeControlDialog.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iselection.h"
+#include "icommandsystem.h"
 #include <sigc++/connection.h>
 #include "wxutil/window/TransientWindow.h"
 #include "wxutil/XmlResourceBasedWidget.h"