mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-28 14:53:58 +00:00
Code Issues Projects Releases Wiki Activity

disable merge menu item when a merge is already in progress

Browse Source 
(cherry picked from commit 708cacdec403793a0337c6e536a1ecf53a58bd6e)
This commit is contained in:
Marc Zinnschlag 2015-08-08 16:47:58 +02:00 committed by cc9cii
parent a5a0990d3c
commit c2ed475950
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/opencs/view/doc/view.cpp
View File

@ -423,7 +423,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)