summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-09 03:54:20 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-09 03:54:20 +0300
commitffbd974deb426cdda39e1f0137a7fc4df681418d (patch)
treeeff68e4eca4e4a9e53fec9042e743176e89ad030 /src
parent96881273472a9ccbf8b43391d6ffe8e8df1bfb87 (diff)
downloadplus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.gz
plus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.bz2
plus-ffbd974deb426cdda39e1f0137a7fc4df681418d.tar.xz
plus-ffbd974deb426cdda39e1f0137a7fc4df681418d.zip
Fix joystick after reconnecting to server.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp3
-rw-r--r--src/game.cpp1
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)