From ffbd974deb426cdda39e1f0137a7fc4df681418d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 9 Nov 2011 03:54:20 +0300
Subject: Fix joystick after reconnecting to server.

---
 src/client.cpp | 3 +++
 src/game.cpp   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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)
-- 
cgit v1.2.3-60-g2f50