summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game.cpp1
-rw-r--r--src/keyboardconfig.cpp3
2 files changed, 3 insertions, 1 deletions
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()