From a30bb2e92405fb379db298f2996e1c0ecd3f4bbd Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Mon, 23 Jul 2007 09:48:14 +0000
Subject: Fixed segfault on exit when OpenGL configuration changed.

---
 src/game.cpp | 2 ++
 src/main.cpp | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/game.cpp b/src/game.cpp
index 1afc530b..7385549b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -294,6 +294,8 @@ Game::~Game()
     delete joystick;
     delete particleEngine;
 
+    viewport->setMap(NULL);
+    player_node = NULL;
     beingManager = NULL;
     floorItemManager = NULL;
     joystick = NULL;
diff --git a/src/main.cpp b/src/main.cpp
index 79ba49b4..8b631d56 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -992,12 +992,6 @@ int main(int argc, char *argv[])
                     {
                         state = STATE_EXIT;
                     }
-                    else if (state != STATE_FORCE_QUIT)
-                    {
-                        //TODO: solve this problem
-                        delete gui; // Crashes otherwise
-                        gui = new Gui(graphics);
-                    }
                     break;
 
                 case STATE_SWITCH_CHARACTER:
-- 
cgit v1.2.3-70-g09d2