summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-03-30 02:05:40 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-01 03:11:26 +0300
commita39f63cdfa5ce15b22f294a8bb1db3a036ce462d (patch)
tree4de71bde947cae0cf5d3196cd97e82f5bc537c5c /src/game.cpp
parent02ec4369acfbf261236631e20dbb76131e7889f8 (diff)
downloadmanaplus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.gz
manaplus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.bz2
manaplus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.xz
manaplus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.zip
One part of fixes after auto checking.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e20b6c5df..143751731 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -900,7 +900,7 @@ void Game::handleActive(SDL_Event &event)
if (event.active.gain)
{ // window restore
Client::setIsMinimized(false);
- if (!player_node && !player_node->getAway())
+ if (player_node && !player_node->getAway())
fpsLimit = config.getIntValue("fpslimit");
if (player_node)
player_node->setHalfAway(false);
@@ -983,7 +983,8 @@ void Game::handleInput()
{
try
{
- guiInput->pushInput(event);
+ if (guiInput)
+ guiInput->pushInput(event);
}
catch (const gcn::Exception &e)
{