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

#4538 Skip Save project at exit when no data has changed

Browse Source 
Guard changes in preferences and reset change detector when project is closed
This commit is contained in:
Magne Sjaastad
2019-08-07 14:21:37 +02:00
parent 5e2485863c
commit 58cef265ec
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp
View File

@@ -24,6 +24,7 @@
#include "RiuPropertyViewTabWidget.h"
#include "cafPdmSettings.h"
#include "cafPdmUiModelChangeDetector.h"
#include <QAction>
@@ -65,6 +66,13 @@ void RicEditPreferencesFeature::onActionTriggered(bool isChecked)
caf::PdmSettings::readFieldsFromApplicationStore(app->preferences());
app->preferences()->initAfterReadRecursively();
}
if (!app->isProjectSavedToDisc())
{
// Always reset change detector when modifying preferences, as these changes are irrelevant
// when the project we work on is not saved to disc
caf::PdmUiModelChangeDetector::instance()->reset();
}
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/Commands/SsiHubImportCommands/RicWellPathsImportSsihubFeature.cpp
View File

@@ -27,8 +27,6 @@
#include "RiuMainWindow.h"
#include "RiuWellImportWizard.h"
#include "cafUtils.h"
#include <QAction>
#include <QDir>
#include <QFile>
@@ -52,7 +50,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance();
if (!app->project()) return;
if (!caf::Utils::fileExists(app->project()->fileName()))
if (!app->isProjectSavedToDisc())
{
RiaGuiApplication* guiApp = RiaGuiApplication::instance();
if (guiApp)
@@ -74,7 +72,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
}
}
if (!caf::Utils::fileExists(app->project()->fileName()))
if (!app->isProjectSavedToDisc())
{
return;
}