summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/lib.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 040eab3..cef46a1 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -74,4 +74,5 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
{
m_initialized = false;
+ m_duringInitialization = false;
m_video = false;
m_wid = widget;
@@ -104,4 +105,5 @@ void Lib::run()
void Lib::initialize()
{
+ m_duringInitialization = true;
m_xine = xine_new( );
@@ -135,4 +137,5 @@ void Lib::initialize()
xine_event_create_listener_thread (m_queue, xine_event_handler, this);
+ m_duringInitialization = false;
}
@@ -156,5 +159,5 @@ Lib::~Lib() {
void Lib::resize ( const QSize &s ) {
- assert( m_initialized );
+ assert( m_initialized || m_duringInitialization );
if ( s. width ( ) && s. height ( ) ) {
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 7e3a912..9dd7385 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -194,4 +194,5 @@ namespace XINE {
int m_bytes_per_pixel;
bool m_initialized:1;
+ bool m_duringInitialization:1;
bool m_video:1;
XineVideoWidget *m_wid;