From 398fe6e780314bd94bee591a9d59b608b48aee56 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 4 Jan 2015 01:33:36 +0100
Subject: [PATCH] Thrown weapon fix (Fixes #2248)

---
 apps/openmw/mwrender/weaponanimation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 8a9feef03..8af4d637a 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -68,9 +68,6 @@ void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
 
 void WeaponAnimation::releaseArrow(MWWorld::Ptr actor)
 {
-    if (!mAmmunition.get())
-        return;
-
     MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
     MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
     if (weapon == inv.end())
@@ -131,6 +128,9 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor)
         if (ammo == inv.end())
             return;
 
+        if (!mAmmunition.get())
+            return;
+
         Ogre::Vector3 launchPos(0,0,0);
         if (mAmmunition->mSkelBase)
         {