From bb45b6a8ca4ea751bceb5853060251a3eefcd4fc Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 16:36:34 -0600
Subject: Delete local player earlier and fix a rare crash

Rare crash is in KeyboardConfig, where the active keys array is accessed
before it's initialized. Also remove some debug prints that made it into
a previous commit.
---
 src/game.cpp           | 1 +
 src/keyboardconfig.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game.cpp b/src/game.cpp
index 3b621acd..13be3663 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -345,6 +345,7 @@ Game::~Game()
     destroyGuiWindows();
 
     delete beingManager;
+    delete player_node;
     delete floorItemManager;
     delete joystick;
     delete particleEngine;
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 8187bef7..8ed23c65 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -198,7 +198,8 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const
 
 bool KeyboardConfig::isKeyActive(int index)
 {
-    return mActiveKeys[ mKey[index].value];
+    if (!mActiveKeys) return false;
+    return mActiveKeys[mKey[index].value];
 }
 
 void KeyboardConfig::refreshActiveKeys()
-- 
cgit v1.2.3-70-g09d2