[Scummvm-git-logs] scummvm master -> 292de85ba8d87aef211936d85e4660c419fdfec7

[bluegr]

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

Summary:
292de85ba8 NANCY: Always return to the game scene after loading


Commit: 292de85ba8d87aef211936d85e4660c419fdfec7
    https://github.com/scummvm/scummvm/commit/292de85ba8d87aef211936d85e4660c419fdfec7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-01T01:52:54+03:00

Commit Message:
NANCY: Always return to the game scene after loading

Fix #16717

Changed paths:
    engines/nancy/nancy.cpp
    engines/nancy/state/scene.cpp


diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index 16b4bf88b01..9958cf6b01d 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -115,7 +115,10 @@ Common::Error NancyEngine::loadGameState(int slot) {
 		ConfMan.setInt("display_slot", slot, Common::ConfigManager::kTransientDomain);
 	}
 
-	return Engine::loadGameState(slot);
+	Common::Error result = Engine::loadGameState(slot);
+	if (result.getCode() == Common::kNoError)
+		g_nancy->setState(NancyState::kScene);
+	return result;
 }
 
 Common::Error NancyEngine::loadGameStream(Common::SeekableReadStream *stream) {
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index 0a16c6ce0eb..bc0ed7aa336 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -863,7 +863,6 @@ void Scene::init() {
 		int saveSlot = ConfMan.getInt("save_slot", Common::ConfigManager::kTransientDomain);
 		if (saveSlot >= 0 && saveSlot <= g_nancy->getMetaEngine()->getMaximumSaveSlot()) {
 			g_nancy->loadGameState(saveSlot);
-			g_nancy->setState(NancyState::kScene);
 		}
 
 		// Remove key so clicking on "New Game" in start menu doesn't just reload the save