From ff10b54405fe8980a022e98cd79d912c1f0ac353 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Feb 2016 02:12:14 +0300
Subject: Add missing checks.

---
 src/gui/viewport.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1a8231780..e0d5d217f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -491,13 +491,16 @@ bool Viewport::leftMouseAction()
     }
     else if (stopAttack)
     {
-        const int mouseTileX = (mMouseX + mPixelViewX)
-            / mMap->getTileWidth();
-        const int mouseTileY = (mMouseY + mPixelViewY)
-            / mMap->getTileHeight();
-        inputManager.executeChatCommand(InputAction::PET_MOVE,
-            strprintf("%d %d", mouseTileX, mouseTileY),
-            nullptr);
+        if (mMap)
+        {
+            const int mouseTileX = (mMouseX + mPixelViewX)
+                / mMap->getTileWidth();
+            const int mouseTileY = (mMouseY + mPixelViewY)
+                / mMap->getTileHeight();
+            inputManager.executeChatCommand(InputAction::PET_MOVE,
+                strprintf("%d %d", mouseTileX, mouseTileY),
+                nullptr);
+        }
         return true;
     }
     // Just walk around
@@ -587,6 +590,8 @@ void Viewport::getMouseTile(int &destX, int &destY)
 void Viewport::getMouseTile(const int x, const int y,
                             int &destX, int &destY) const
 {
+    if (!mMap)
+        return;
     const int tw = mMap->getTileWidth();
     const int th = mMap->getTileHeight();
     destX = CAST_S32(x + mPixelViewX)
-- 
cgit v1.2.3-60-g2f50