summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-08-01 08:53:09 +0200
committerDavid Ostrovsky <david@ostrovsky.org>2015-08-01 08:53:09 +0200
commit935fb7cc075ebc60712ef4f2f3a84c4470bbaddf (patch)
treec3caa0da5b07dbca564c2deafa0c25d0316f64dc /avmedia
parent5916d5866c109b17471a9c8604635612a0aa69ae (diff)
std::function::operator bool returns true if it contains a valid target
Change-Id: I8e65c0243094468dca06a1b30b5244bef931f8ac
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/vlc/wrapper/EventHandler.cxx2
-rw-r--r--avmedia/source/vlc/wrapper/EventManager.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 3fa6bc27da64..39a610137157 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 9759d587bccf..2b3cbe21fd51 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 );