[vlc-commits] commit: skins2: delete the callback only if it was really added. ( Rémi Duraffort )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jun 12 09:40:01 2010 +0200| [679e4e763f97d8267621729f80323aaa050e9647] | committer: Rémi Duraffort 

skins2: delete the callback only if it was really added.
(cherry picked from commit 2c383bfcff7a1c54108a9fce254fe91c92ace979)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=679e4e763f97d8267621729f80323aaa050e9647
---

 modules/gui/skins2/src/dialogs.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index 304172b..ca260d8 100644
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -115,11 +115,11 @@ Dialogs::~Dialogs()
         // Detach the dialogs provider from its parent interface
         module_unneed( m_pProvider, m_pModule );
         vlc_object_release( m_pProvider );
-    }
 
-    /* Unregister callbacks */
-    var_DelCallback( getIntf()->p_libvlc, "intf-popupmenu",
-                     PopupMenuCB, this );
+        /* Unregister callbacks */
+        var_DelCallback( getIntf()->p_libvlc, "intf-popupmenu",
+                         PopupMenuCB, this );
+    }
 }