aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorupthorn2012-07-28 21:15:38 -0700
committerangstsmurf2016-10-18 02:12:56 +0200
commit74c75e36cac3c8b93be94c41df72ad1ea1c295fa (patch)
treee01cf5005f278da42d440fbd4ca4a74550cb10b5
parent5649ce55fc867d711ae3fb5dfd26f3be879995b0 (diff)
downloadscummvm-rg350-74c75e36cac3c8b93be94c41df72ad1ea1c295fa.tar.gz
scummvm-rg350-74c75e36cac3c8b93be94c41df72ad1ea1c295fa.tar.bz2
scummvm-rg350-74c75e36cac3c8b93be94c41df72ad1ea1c295fa.zip
COMPOSER: Fix for issue when save_slot is in config.
-rw-r--r--engines/composer/composer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index f3e5958304..061ec49151 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -121,6 +121,8 @@ Common::Error ComposerEngine::run() {
warning("FPS in book.ini is zero. Defaulting to 8...");
uint32 lastDrawTime = 0;
_lastSaveTime = _system->getMillis();
+
+ bool loadFromLauncher = ConfMan.hasKey("save_slot");
while (!shouldQuit()) {
for (uint i = 0; i < _pendingPageChanges.size(); i++) {
@@ -170,9 +172,9 @@ Common::Error ComposerEngine::run() {
} else if (_needsUpdate) {
redraw();
}
- if (ConfMan.hasKey("save_slot")) {
+ if (loadFromLauncher) {
loadGameState(ConfMan.getInt("save_slot"));
- ConfMan.removeKey("save_slot", Common::ConfigManager::kTransientDomain);
+ loadFromLauncher = false;
}
if (shouldPerformAutoSave(_lastSaveTime))
saveGameState(0, "Autosave");