1 files changed, 15 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index f5565b71e..efa5085f5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -484,12 +484,27 @@ void Game::logic()
 
         if (!disconnectedDialog)
         {
+            if (viewport)
+            {
+                Map *map = viewport->getCurrentMap();
+                if (map)
+                    map->saveExtraLayer();
+            }
+            Client::closeDialogs();
             disconnectedDialog = new OkDialog(_("Network Error"),
                                               errorMessage, false);
             disconnectedDialog->addActionListener(&errorListener);
             disconnectedDialog->requestMoveToTop();
         }
     }
+    else
+    {
+        if (disconnectedDialog)
+        {
+            disconnectedDialog->scheduleDelete();
+            disconnectedDialog = 0;
+        }
+    }
 }
 
 /**