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

#7778 MainWindow: fix crash when reopening grid case

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-05-18 14:35:24 +02:00
parent 837a0f208c
commit 9678b80feb
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp
View File

@@ -18,6 +18,8 @@
#include "RicShowMainWindowFeature.h"
#include "RiaGuiApplication.h"
#include "RiuMainWindow.h"
#include <QAction>
@@ -31,19 +33,27 @@ void RicShowMainWindowFeature::showMainWindow()
{
RiuMainWindow* mainWnd = RiuMainWindow::instance();
if ( mainWnd->isMinimized() )
if ( mainWnd )
{
mainWnd->showNormal();
mainWnd->update();
if ( mainWnd->isMinimized() )
{
mainWnd->showNormal();
mainWnd->update();
}
else
{
mainWnd->show();
}
mainWnd->raise();
mainWnd->restoreDockWidgetVisibilities();
}
else
{
mainWnd->show();
RiaGuiApplication* app = RiaGuiApplication::instance();
app->getOrCreateAndShowMainWindow();
}
mainWnd->raise();
mainWnd->restoreDockWidgetVisibilities();
}
//--------------------------------------------------------------------------------------------------