From 1a9330a5f6cd753b4155ac74db104cb0ffa095c9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Jan 2015 13:30:24 +0300
Subject: Allow open cart window only if cart status effect enabled.

---
 src/actions/windows.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/actions/windows.cpp')

diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 9a7743590..91d965748 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -22,6 +22,8 @@
 
 #include "actions/actiondef.h"
 
+#include "being/localplayer.h"
+
 #include "gui/dialogsmanager.h"
 
 #include "gui/windows/bankwindow.h"
@@ -277,8 +279,12 @@ impHandler0(bankWindowShow)
 
 impHandler0(cartWindowShow)
 {
-    if (!serverFeatures->haveCart())
+    if (!serverFeatures->haveCart()
+        || !localPlayer
+        || !localPlayer->getHaveCart())
+    {
         return false;
+    }
 
     showHideWindow(cartWindow);
     return true;
-- 
cgit v1.2.3-70-g09d2