diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-23 09:48:14 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-23 09:48:14 +0000 |
| commit | a30bb2e92405fb379db298f2996e1c0ecd3f4bbd (patch) | |
| tree | 40f873fe391c9a2ff7001d7d0ecd0241e0e0cdf1 /src | |
| parent | cd95ffd1dccb44ee05968a57cae1787a63d700d2 (diff) | |
| download | mana-a30bb2e92405fb379db298f2996e1c0ecd3f4bbd.tar.gz mana-a30bb2e92405fb379db298f2996e1c0ecd3f4bbd.tar.bz2 mana-a30bb2e92405fb379db298f2996e1c0ecd3f4bbd.tar.xz mana-a30bb2e92405fb379db298f2996e1c0ecd3f4bbd.zip | |
Fixed segfault on exit when OpenGL configuration changed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
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: |