[GUICallback] Correct operators &operator=(GUIEvent<Cookie> &aEvent) …

…and &operator=(Callback<Result, Cookie> &aCallback).
xbmc · Aug 25, 2013 · 0859f84 · 0859f84
1 parent 57e492e
commit 0859f84
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/xbmc/guilib/GUICallback.h b/xbmc/guilib/GUICallback.h
@@ -55,16 +55,11 @@ class GUIEvent
   // Assign an EventHandler (EventHandler's are derived from Event)
   GUIEvent<Cookie> &operator=(GUIEvent<Cookie> &aEvent)
   {
-    if (&aEvent)
+    if (&aEvent != this)
     {
       m_pInstance = aEvent.m_pInstance;
       m_pMethod = aEvent.m_pMethod;
     }
-    else
-    {
-      GUIEvent();
-    }
-
     return *this;
   }
 
@@ -136,16 +131,11 @@ class Callback
   // Assign a CallbackHandler (CallbackHandler's are derived from Callback)
   Callback<Result, Cookie> &operator=(Callback<Result, Cookie> &aCallback)
   {
-    if (&aCallback)
+    if (&aCallback != this)
     {
       m_pInstance = aCallback.m_pInstance;
       m_pMethod = aCallback.m_pMethod;
     }
-    else
-    {
-      Callback();
-    }
-
     return *this;
   }