disable merge menu item when a merge is already in progress

10 years ago · 708cacdec4
parent 4fd3097c1c
commit 708cacdec4
1 changed files with 2 additions and 1 deletions
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@ -398,7 +398,8 @@ void CSVDoc::View::updateActions()
    mGlobalDebugProfileMenu->updateActions (running);
    mStopDebug->setEnabled (running);

-    mMerge->setEnabled (mDocument->getContentFiles().size()>1);
+    mMerge->setEnabled (mDocument->getContentFiles().size()>1 &&
+        !(mDocument->getState() & CSMDoc::State_Merging));
 }

 CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)