widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/bug1128114 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1128114 in widelands: "segmentation fault when running with --dedicated"
  https://bugs.launchpad.net/widelands/+bug/1128114

For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1128114/+merge/152040

Exactly as guessed, it was a missing if (g_gr)... 
-- 
https://code.launchpad.net/~qcumber-some/widelands/bug1128114/+merge/152040
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug1128114 into lp:widelands.

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2013-03-06 17:55:07 +0000
+++ src/wlapplication.cc	2013-03-06 19:38:23 +0000
@@ -308,8 +308,11 @@
 	if (SDLNet_Init() == -1)
 		throw wexception("SDLNet_Init failed: %s\n", SDLNet_GetError());
 
-	UI::g_fh = new UI::Font_Handler();
-	UI::g_fh1 = UI::create_fonthandler(g_gr, g_fs);
+	if (g_gr)
+	{
+		UI::g_fh = new UI::Font_Handler();
+		UI::g_fh1 = UI::create_fonthandler(g_gr, g_fs);
+	}
 
 	//make sure we didn't forget to read any global option
 	g_options.check_used();