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

#4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-10-25 08:25:47 +02:00
parent e21e4f5008
commit 785f039a1d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -286,7 +286,7 @@ QString RimViewLinker::displayNameForView( RimGridView* view )
if ( view ) if ( view )
{ {
displayName = view->autoName(); displayName = view->autoName();
} }
return displayName; return displayName;
@@ -431,9 +431,15 @@ void RimViewLinker::findNameAndIconFromView( QString* name, caf::QIconProvider*
{ {
CVF_ASSERT( name && icon ); CVF_ASSERT( name && icon );
*name = displayNameForView( view ); if ( view )
*icon = view->uiIconProvider(); {
*name = displayNameForView( view );
*icon = view->uiIconProvider();
}
else
{
*icon = caf::QIconProvider();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------