From c7c6894dcede6778f311171f1128024b5ba97d84 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 29 Jun 2013 23:24:52 +0300
Subject: fix working with protected items by automatic checks.

---
 src/gui/widgets/shoplistbox.cpp | 4 ++--
 src/playerinfo.cpp              | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 827bb6755..6516b056f 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -108,8 +108,8 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
         gcn::Color* backgroundColor = &mBackgroundColor;
 
         ShopItem *const item = mShopItems->at(i);
-        if ((mShopItems && item && mPlayerMoney < item->getPrice()
-            && mPriceCheck) || PlayerInfo::isItemProtected(item->getId()))
+        if (item && ((mShopItems && mPlayerMoney < item->getPrice()
+            && mPriceCheck) || PlayerInfo::isItemProtected(item->getId())))
         {
             if (i != mSelected)
             {
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index f2e933a24..4e780f4df 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -359,8 +359,10 @@ static void saveProtectedItems()
     std::set<int>::const_iterator it = mProtectedItems.begin();
     std::set<int>::const_iterator it_end = mProtectedItems.end();
     if (it != it_end)
+    {
         str.append(toString(*it));
-    ++ it;
+        ++ it;
+    }
     while (it != it_end)
     {
         str.append(",").append(toString(*it));
-- 
cgit v1.2.3-70-g09d2