1 files changed, 3 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 74a52ddf..ae708adf 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -204,7 +204,6 @@ void createGuiWindows(Network *network)
     npcListDialog = new NpcListDialog(network);
     npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog;
-    setupWindow = new Setup;
     minimap = new Minimap;
     equipmentWindow = new EquipmentWindow;
     tradeWindow = new TradeWindow(network);
@@ -341,11 +340,12 @@ Game::Game(Network *network):
     msg.writeInt32(tick_time);
 
     engine->changeMap(map_path);
+
+    setupWindow->setInGame(true);
 }
 
 Game::~Game()
 {
-    delete player_node;
     destroyGuiWindows();
 
     delete beingManager;
@@ -353,6 +353,7 @@ Game::~Game()
     delete joystick;
     delete particleEngine;
     delete engine;
+    delete player_node;
 
     beingManager = NULL;
     floorItemManager = NULL;