#5643: User will be asked if the merge should be cancelled before clo…

…sing the control dialog.

libs/wxutil/window/TransientWindow.h

@@ -48,7 +48,7 @@ class TransientWindow :
 	virtual ~TransientWindow() {}
 
 	// Override wxWindow::Show
-	virtual bool Show(bool show = true);
+	virtual bool Show(bool show = true) override;
 
 	virtual void ToggleVisibility();
 

radiant/ui/merge/MergeControlDialog.cpp

@@ -9,6 +9,7 @@
 #include "imap.h"
 #include "wxutil/PathEntry.h"
 #include "wxutil/Bitmap.h"
+#include "wxutil/dialog/MessageBox.h"
 #include "scenelib.h"
 #include "string/convert.h"
 #include "os/path.h"
@@ -127,6 +128,26 @@ void MergeControlDialog::onMainFrameShuttingDown()
     InstancePtr().reset();
 }
 
+bool MergeControlDialog::Show(bool show)
+{
+    // Check if there's a merge operation in progress
+    // If yes, we ask the user before closing the window
+    if (!show && IsShown() && GlobalMapModule().getEditMode() == IMap::EditMode::Merge)
+    {
+        if (wxutil::Messagebox::Show(_("Abort the Merge Operation?"),
+            _("The current merge operation hasn't been finished yet.\nDo you want to abort the merge?"),
+            IDialog::MessageType::MESSAGE_ASK, this) == IDialog::RESULT_NO)
+        {
+            return false; // block this call
+        }
+
+        // User wants to cancel, abort the merge and continue calling base
+        GlobalMapModule().abortMergeOperation();
+    }
+
+    return TransientWindow::Show(show);
+}
+
 void MergeControlDialog::ShowDialog(const cmd::ArgumentList& args)
 {
     Instance().Show();

radiant/ui/merge/MergeControlDialog.h

@@ -11,7 +11,7 @@ namespace ui
 {
 
 
-class MergeControlDialog :
+class MergeControlDialog final :
     public wxutil::TransientWindow,
     private wxutil::XmlResourceBasedWidget,
     public SelectionSystem::Observer,
@@ -31,6 +31,8 @@ class MergeControlDialog :
 
     static MergeControlDialog& Instance();
 
+    bool Show(bool show = true) override;
+
     // The command target
     static void ShowDialog(const cmd::ArgumentList& args);