summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0fa4044a..50ae193b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[])
Net::getGeneralHandler()->tick();
- if (progressBar->isVisible())
+ if (progressBar && progressBar->isVisible())
{
progressBar->setProgress(progressBar->getProgress() + 0.005f);
if (progressBar->getProgress() == 1.0f)
@@ -1470,7 +1470,8 @@ int main(int argc, char *argv[])
game = new Game;
game->logic();
delete game;
- state = STATE_EXIT;
+ if (state != STATE_ERROR)
+ state = STATE_EXIT;
break;
case STATE_UPDATE: