More warning removal (Some code modifications and cleanup when needed)

--HG--
branch : trunk

1 files changed, 6 insertions, 3 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 1828a3ec37f..eddbb230b16 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -557,9 +557,12 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
     Spell * modSpell = NULL;
     Player * modOwner = NULL;
     if (caster)
-        if ((modOwner = caster->GetSpellModOwner())
-        && (modSpell = modOwner->FindCurrentSpellBySpellId(GetId())))
-        modOwner->SetSpellModTakingSpell(modSpell, true);
+    {
+        modOwner = caster->GetSpellModOwner();
+        modSpell = modOwner->FindCurrentSpellBySpellId(GetId());
+        if (modOwner && modSpell)
+            modOwner->SetSpellModTakingSpell(modSpell, true);
+    }
 
     Update(diff, caster);