From dce7bec2d33b404b81262a6f46dd4f8be10d46e6 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Mon, 15 Sep 2008 23:50:12 +0000
Subject: (svn r14339) -Fix (r13731): crash when loading the intro game failed

---
 src/openttd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/openttd.cpp b/src/openttd.cpp
index afbe2628a..a06b0137c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -363,10 +363,12 @@ static void LoadIntroGame()
 	if (SaveOrLoad("opntitle.dat", SL_LOAD, DATA_DIR) != SL_OK) {
 		GenerateWorld(GW_EMPTY, 64, 64); // if failed loading, make empty world.
 		WaitTillGeneratedWorld();
+		SetLocalPlayer(PLAYER_SPECTATOR);
+	} else {
+		SetLocalPlayer(PLAYER_FIRST);
 	}
 
 	_pause_game = 0;
-	SetLocalPlayer(PLAYER_FIRST);
 	_cursor.fix_at = false;
 	MarkWholeScreenDirty();
 
-- 
cgit v1.2.3-70-g09d2