From 3628faf72bfd17bb6500200216c3be04053d2bcc Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <anonymous.maarten@gmail.com>
Date: Tue, 28 Aug 2018 22:15:20 +0200
Subject: [PATCH] rwviewer: load gamedata before passing it to gameworld

---
 rwviewer/ViewerWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rwviewer/ViewerWindow.cpp b/rwviewer/ViewerWindow.cpp
index d10c414c..92f230a6 100644
--- a/rwviewer/ViewerWindow.cpp
+++ b/rwviewer/ViewerWindow.cpp
@@ -144,12 +144,12 @@ void ViewerWindow::loadGame(const QString& path) {
     }
 
     gameData = std::make_unique<GameData>(&engineLog, gameDir.absolutePath().toStdString());
+    gameData->load();
+
     gameWorld = std::make_unique<GameWorld>(&engineLog, gameData.get());
     renderer = std::make_unique<GameRenderer>(&engineLog, gameData.get());
     gameWorld->state = new GameState;
 
-    gameWorld->data->load();
-
     renderer->text.setFontTexture(FONT_PAGER, "pager");
     renderer->text.setFontTexture(FONT_PRICEDOWN, "font1");
     renderer->text.setFontTexture(FONT_ARIAL, "font2");