From 9969efd8d1d03a0b0694f8436ca9b64e20418c88 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 16 Aug 2014 18:32:49 +0000
Subject: [PATCH] Mapster32: fix a crash when m32_settings.cfg contains video
 setting.

Such as "vid_gamma". In that case, setbrightness() would have been
called without basepaltableptr having been initialized.
The fix is by moving the preparational setbasepaltable() call from
ExtPostStartupWindow() to ExtInit(), just before the OSD command
dispatching.

git-svn-id: https://svn.eduke32.com/eduke32@4573 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/astub.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index cfbac3a73..936421115 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -9807,6 +9807,11 @@ int32_t ExtInit(void)
     Bsprintf(apptitle, "Mapster32 %s %s", VERSION, s_buildRev);
     autosavetimer = totalclock+120*autosave;
 
+    // This must run before the following OSD_Exec() as the cfg may
+    // e.g. contain a vid_gamma setting, resulting in a crash in
+    // setbrightness() which expects basepaltableptr to be initialized.
+    setbasepaltable(basepaltable, BASEPALCOUNT);
+
     registerosdcommands();
 
     {
@@ -9842,8 +9847,6 @@ int32_t ExtPostStartupWindow(void)
         return -1;
     }
 
-    setbasepaltable(basepaltable, BASEPALCOUNT);
-
     if (ReadPaletteTable())
         return -1;