(svn r22811) -Change: don't try to load static NewGRFs when loading the intro game for the first time

2011-08-22 12:54:17 +00:00
parent 9c73f15cde
commit 21f194bbf2
1 changed files with 2 additions and 2 deletions
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -95,8 +95,8 @@ static void Load_NGRF()
 {
 	Load_NGRF_common(_grfconfig);

-	/* Append static NewGRF configuration */
-	AppendStaticGRFConfigs(&_grfconfig);
+	/* Append static NewGRF configuration, but only if there are some NewGRFs. */
+	if (_game_mode != GM_MENU || _all_grfs != NULL) AppendStaticGRFConfigs(&_grfconfig);
 }

 static void Check_NGRF()