diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-09 03:54:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-09 03:54:20 +0300 |
| commit | ffbd974deb426cdda39e1f0137a7fc4df681418d (patch) | |
| tree | eff68e4eca4e4a9e53fec9042e743176e89ad030 | |
| parent | 96881273472a9ccbf8b43391d6ffe8e8df1bfb87 (diff) | |
| download | manaplus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.gz manaplus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.bz2 manaplus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.xz manaplus-ffbd974deb426cdda39e1f0137a7fc4df681418d.zip | |
Fix joystick after reconnecting to server.
| -rw-r--r-- | src/client.cpp | 3 | ||||
| -rw-r--r-- | src/game.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp index 8e3babf2e..62f8ae504 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -709,6 +709,9 @@ Client::~Client() delete userPalette; userPalette = nullptr; + delete joystick; + joystick = nullptr; + logger->log1("Quitting10"); config.write(); diff --git a/src/game.cpp b/src/game.cpp index 0825a74cf..a6d79658c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -431,7 +431,6 @@ Game::~Game() del_0(channelManager) del_0(commandHandler) del_0(effectManager) - del_0(joystick) del_0(particleEngine) del_0(viewport) del_0(mCurrentMap) |