mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Merged in changes from maintenance branch
This commit is contained in:
@@ -175,15 +175,14 @@ void RiuMainWindow::initializeGuiNewProjectLoaded()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMainWindow::cleanupGuiBeforeProjectClose()
|
||||
void RiuMainWindow::cleanupGuiCaseClose()
|
||||
{
|
||||
caf::CmdExecCommandManager::instance()->undoStack()->clear();
|
||||
|
||||
setPdmRoot(NULL);
|
||||
setResultInfo("");
|
||||
|
||||
m_resultQwtPlot->deleteAllCurves();
|
||||
|
||||
|
||||
if (m_pdmUiPropertyView)
|
||||
{
|
||||
m_pdmUiPropertyView->showProperties(NULL);
|
||||
@@ -200,6 +199,16 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
|
||||
m_processMonitor->startMonitorWorkProcess(NULL);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMainWindow::cleanupGuiBeforeProjectClose()
|
||||
{
|
||||
setPdmRoot(NULL);
|
||||
|
||||
cleanupGuiCaseClose();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user