3 files changed, 10 insertions, 3 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 9a19c0edc..b5c2e1829 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -637,7 +637,8 @@ void Client::gameInit()
     emoteShortcut = new EmoteShortcut;
     dropShortcut = new DropShortcut;
 
-    gui = new Gui(mainGraphics);
+    gui = new Gui();
+    gui->postInit(mainGraphics);
 
     // Initialize sound engine
     try
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 18cc061b2..d32e81fe8 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -82,7 +82,7 @@ class GuiConfigListener final : public ConfigListener
         Gui *mGui;
 };
 
-Gui::Gui(Graphics *const graphics) :
+Gui::Gui() :
     gcn::Gui(),
     mConfigListener(new GuiConfigListener(this)),
     mGuiFont(),
@@ -104,6 +104,10 @@ Gui::Gui(Graphics *const graphics) :
     mCustomCursor(false),
     mDoubleClick(true)
 {
+}
+
+void Gui::postInit(Graphics *const graphics)
+{
     logger->log1("Initializing GUI...");
     // Set graphics
     setGraphics(graphics);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index e82587623..85ec33415 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -56,7 +56,7 @@ class Gui final : public gcn::Gui
         /**
          * Constructor.
          */
-        explicit Gui(Graphics *const screen);
+        Gui();
 
         A_DELETE_COPY(Gui)
 
@@ -65,6 +65,8 @@ class Gui final : public gcn::Gui
          */
         ~Gui();
 
+        void postInit(Graphics *const graphics);
+
         /**
          * Performs logic of the GUI. Overridden to track mouse pointer
          * activity.