From db6cab7a6f92855b2264f1899011346dc2e1b91d Mon Sep 17 00:00:00 2001
From: uruk
Date: Mon, 28 Jul 2014 20:40:42 +0200
Subject: CGE2: Repair loading from savestate.

---
 engines/cge2/cge2_main.cpp | 6 +++---
 engines/cge2/saveload.cpp  | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 65f856d815..2669ac9fe7 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -669,10 +669,10 @@ void CGE2Engine::loadUser() {
 
 	if (_startGameSlot != -1)
 		loadGame(_startGameSlot);
-	else
+	else {
 		loadScript("CGE.INI");
-	
-	loadHeroes();
+		loadHeroes();
+	}
 }
 
 void CGE2Engine::loadHeroes() { // Original name: loadGame()
diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp
index 5e60f07bcd..c468f65855 100644
--- a/engines/cge2/saveload.cpp
+++ b/engines/cge2/saveload.cpp
@@ -369,6 +369,9 @@ bool CGE2Engine::loadGame(int slotNumber) {
 	delete readStream;
 
 	syncSpeechSettings();
+
+	loadHeroes();
+	initToolbar();
 	
 	return true;
 }
-- 
cgit v1.2.3