From 338efdb705ebe7cae16484d56f3fcd45197e9978 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 11 Aug 2018 19:00:02 +0300
Subject: [PATCH] [General] Fix issues with
 MechanicsHelper::getItemPtrFromStore()

---
 apps/openmw/mwmp/MechanicsHelper.cpp                          | 2 ++
 apps/openmw/mwmp/processors/player/ProcessorPlayerItemUse.hpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmp/MechanicsHelper.cpp b/apps/openmw/mwmp/MechanicsHelper.cpp
index 7e143ecfd..9118effaa 100644
--- a/apps/openmw/mwmp/MechanicsHelper.cpp
+++ b/apps/openmw/mwmp/MechanicsHelper.cpp
@@ -374,4 +374,6 @@ MWWorld::Ptr MechanicsHelper::getItemPtrFromStore(const mwmp::Item& item, MWWorl
             return *storeIterator;
         }
     }
+
+    return 0;
 }
diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerItemUse.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerItemUse.hpp
index a19a316c0..43f8216e3 100644
--- a/apps/openmw/mwmp/processors/player/ProcessorPlayerItemUse.hpp
+++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerItemUse.hpp
@@ -35,7 +35,7 @@ namespace mwmp
                 MWWorld::Ptr &playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
                 MWWorld::InventoryStore &inventoryStore = playerPtr.getClass().getInventoryStore(playerPtr);
 
-                MWWorld::Ptr &itemPtr = MechanicsHelper::getItemPtrFromStore(player->usedItem, inventoryStore);
+                MWWorld::Ptr itemPtr = MechanicsHelper::getItemPtrFromStore(player->usedItem, inventoryStore);
                 MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(itemPtr);
             }
         }