disable merge menu item when a merge is already in progress

This commit is contained in:
Marc Zinnschlag 2015-08-08 16:47:58 +02:00
parent 4fd3097c1c
commit 708cacdec4

View file

@ -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)