OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4316 Fix regression issue with export completion and import menus showing up everywhere

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-04-12 12:54:40 +02:00
parent 54a096a660
commit 34fd604bd8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -835,7 +835,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
// Work in progress -- End
appendCreateCompletions(menuBuilder, menuBuilder.itemCount() > 0u);
appendImportMenu(menuBuilder, menuBuilder.itemCount() > 0u);
bool addedExportWellPaths = appendExportWellPaths(menuBuilder, menuBuilder.itemCount() > 0u) > 0;
appendExportCompletions(menuBuilder, menuBuilder.itemCount() > 0u && !addedExportWellPaths);
@@ -1127,7 +1126,8 @@ int RimContextCommandBuilder::appendSubMenuWithCommands(caf::CmdFeatureMenuBuild
}
else
{
if (!menuBuilder.isCmdFeatureAdded(candidate))
if (caf::CmdFeatureManager::instance()->getCommandFeature(candidate.toStdString())->canFeatureBeExecuted() &&
!menuBuilder.isCmdFeatureAdded(candidate))
{
validCommands << candidate;
actualCommandsAdded++;