1 files changed, 11 insertions, 5 deletions
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 6104d31fa0e4..188ccbc698c0 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.cxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.cxx
@@ -11,12 +11,18 @@
 
 namespace VLC
 {
-EventHandler::EventHandler( const char *name )
-    : Thread( name )
+EventHandler::EventHandler()
+    : ::osl::Thread()
 {
 }
 
-void EventHandler::execute()
+void EventHandler::stop()
+{
+    mCallbackQueue.push(TCallback());
+    join();
+}
+
+void EventHandler::run()
 {
     TCallback callback;
     do
@@ -25,8 +31,8 @@ void EventHandler::execute()
 
         if ( callback.empty() )
             return;
-        else
-            callback();
+
+        callback();
     } while ( true );
 }