From 21f194bbf21bc0e71e533e451a2b24ff5ccb4153 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 22 Aug 2011 12:54:17 +0000 Subject: (svn r22811) -Change: don't try to load static NewGRFs when loading the intro game for the first time --- src/saveload/newgrf_sl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/saveload/newgrf_sl.cpp') diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp index df0f462a3..c64ceea1e 100644 --- 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() -- cgit v1.2.3-54-g00ecf