diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-25 01:47:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-25 01:47:34 +0300 |
| commit | 9a970ba6bc80938b56f3ba731bf4614b40ba573d (patch) | |
| tree | c39a480c1df465d31bd7908664c101ca5cd32fa3 /src | |
| parent | 5a1214d380a96fa0a1eeeb07a4bfedeae982051a (diff) | |
| download | mv-9a970ba6bc80938b56f3ba731bf4614b40ba573d.tar.gz mv-9a970ba6bc80938b56f3ba731bf4614b40ba573d.tar.bz2 mv-9a970ba6bc80938b56f3ba731bf4614b40ba573d.tar.xz mv-9a970ba6bc80938b56f3ba731bf4614b40ba573d.zip | |
remove exit on minimisation on SDL2 on Android.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/game.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp index 7717d1e4b..64dd6ed53 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -3235,7 +3235,7 @@ void Client::handleActive(const SDL_Event &event) } else { // window minimization -#ifdef ANDROID +#if defined(ANDROID) && !defined(USE_SDL2) setState(STATE_EXIT); #else setIsMinimized(true); diff --git a/src/game.cpp b/src/game.cpp index ea47f3b08..40585df95 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -896,9 +896,6 @@ void Game::handleSDL2WindowEvent(const SDL_Event &event) client->setInputFocused(false); break; case SDL_WINDOWEVENT_MINIMIZED: -#ifdef ANDROID - client->setState(STATE_EXIT); -#else client->setIsMinimized(true); if (player_node && !player_node->getAway()) { @@ -906,7 +903,6 @@ void Game::handleSDL2WindowEvent(const SDL_Event &event) player_node->setHalfAway(true); } setPriority(false); -#endif break; case SDL_WINDOWEVENT_RESTORED: case SDL_WINDOWEVENT_MAXIMIZED: |