[Scummvm-git-logs] scummvm master -> 4c25af81917ac573b89c94162adfbf956498a46f

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4c25af8191 WINTERMUTE: Flush ConfMan to disk on every change (#1314)


Commit: 4c25af81917ac573b89c94162adfbf956498a46f
    https://github.com/scummvm/scummvm/commit/4c25af81917ac573b89c94162adfbf956498a46f
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2018-09-16T20:15:04+03:00

Commit Message:
WINTERMUTE: Flush ConfMan to disk on every change (#1314)

* WINTERMUTE: Flush ConfMan to disk

Changed paths:
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/saveload.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 24779b9..0ef58d5 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -237,6 +237,7 @@ BaseGame::~BaseGame() {
 	LOG(0, "Shutting down...");
 
 	ConfMan.setBool("last_run", true);
+	ConfMan.flushToDisk();
 
 	cleanup();
 
@@ -3884,7 +3885,6 @@ bool BaseGame::isDoubleClick(int32 buttonIndex) {
 //////////////////////////////////////////////////////////////////////////
 void BaseGame::autoSaveOnExit() {
 	_soundMgr->saveSettings();
-	ConfMan.flushToDisk();
 
 	if (!_autoSaveOnExit) {
 		return;
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp
index 85553a2..6299cf6 100644
--- a/engines/wintermute/base/saveload.cpp
+++ b/engines/wintermute/base/saveload.cpp
@@ -101,6 +101,7 @@ bool SaveLoad::saveGame(int slot, const char *desc, bool quickSave, BaseGame *ga
 				pm->putDWORD(BaseEngine::instance().getRandomSource()->getSeed());
 				if (DID_SUCCEED(ret = pm->saveFile(filename))) {
 					ConfMan.setInt("most_recent_saveslot", slot);
+					ConfMan.flushToDisk();
 				}
 			}
 		}