3 files changed, 16 insertions, 2 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index cef46a1..84194b7 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -101,3 +101,4 @@ void Lib::run()
 {
-    assert( false );
+    initialize();
+    m_initialized = true;
 }
@@ -285,2 +286,12 @@ int Lib::error() const {
 
+void Lib::ensureInitialized()
+{
+    if ( m_initialized )
+        return;
+
+    qDebug( "waiting for initialization thread to finish" );
+    wait();
+    qDebug( "initialization thread finished!" );
+}
+
 void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 9dd7385..6b67f67 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -179,2 +179,4 @@ namespace XINE {
 
+        void ensureInitialized();
+
     signals:
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 1aa3daa..7c54499 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -47,3 +47,2 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
 {
-
     libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget );
@@ -58,2 +57,4 @@ XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget,
 {
+    xine->ensureInitialized();
+
     init();