Fix crash due to Settings not being initialized

clintbellanger · Aug 28, 2018 · 672b234 · 672b234
1 parent 331d92e
commit 672b234
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Version.cpp b/src/Version.cpp
@@ -30,7 +30,7 @@ FLARE. If not, see https://www.gnu.org/licenses/
 
 #include <SDL.h>
 
-Version VersionInfo::ENGINE(1, 6, 42);
+Version VersionInfo::ENGINE(1, 6, 43);
 Version VersionInfo::MIN(0, 0, 0);
 Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -76,8 +76,6 @@ bool init_finished = false;
  * Game initialization.
  */
 static void init(const CmdLineArgs& cmd_line_args) {
- settings = new Settings();
-
  /**
  * Set system paths
  * PATH_CONF is for user-configurable settings files (e.g. keybindings)
@@ -336,6 +334,8 @@ void EmscriptenMainLoop() {
 #endif
 
 int main(int argc, char *argv[]) {
+ settings = new Settings();
+
  bool debug_event = false;
  bool done = false;
  CmdLineArgs cmd_line_args;