[Libreoffice-commits] core.git: avmedia/source

[David Ostrovsky]

 avmedia/source/vlc/wrapper/EventHandler.cxx |    2 +-
 avmedia/source/vlc/wrapper/EventManager.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 935fb7cc075ebc60712ef4f2f3a84c4470bbaddf
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Aug 1 08:53:09 2015 +0200

    std::function::operator bool returns true if it contains a valid target
    
    Change-Id: I8e65c0243094468dca06a1b30b5244bef931f8ac

diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 3fa6bc2..39a6101 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.cxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.cxx
@@ -35,7 +35,7 @@ void EventHandler::run()
     {
         mCallbackQueue.pop( callback );
 
-        if ( callback )
+        if ( !callback )
             return;
 
         callback();
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx
index 9759d58..2b3cbe2 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -66,7 +66,7 @@ EventManager::EventManager( Player& player, EventHandler& eh )
 
 void EventManager::registerSignal( int signal, const Callback& callback )
 {
-    if ( callback )
+    if ( !callback )
         libvlc_event_detach( mManager, signal, Handler, this );
     else
         libvlc_event_attach( mManager, signal, Handler, this );