# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2011-08-22 12:54:17
# Node ID c39d1a133bdf62f07a3f69898043f1997f7ff068
# Parent  3ef131d519a8060fb033b2d4b75cf3f38b050632

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

diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp
--- 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()