diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp
index eb9ec74..73e3355 100644
--- a/app/plaYUVerApp.cpp
+++ b/app/plaYUVerApp.cpp
@@ -353,15 +353,18 @@ Void plaYUVerApp::reload()
 
 Void plaYUVerApp::reloadAll()
 {
-  SubWindowHandle *subWindow;
-  for( Int i = 0; i < mdiArea->subWindowList().size(); i++ )
+  VideoSubWindow *subWindow;
+
+  QList<VideoSubWindow*> videoSubWindowList = mdiArea->findChildren<VideoSubWindow*>();
+  for( Int i = 0; i < videoSubWindowList.size(); i++ )
   {
-    subWindow = qobject_cast<SubWindowHandle *>( mdiArea->subWindowList().at( i ) );
-    if( subWindow->getCategory() == SubWindowHandle::VIDEO_SUBWINDOW )
-      qobject_cast<VideoSubWindow*>( subWindow )->reloadFile();
+    subWindow = videoSubWindowList.at( i );
+    if( !subWindow->getIsModule() )
+    {
+      subWindow->reloadFile();
+    }
   }
 }
-
 Void plaYUVerApp::loadAll()
 {
   if( m_pcCurrentVideoSubWindow )
diff --git a/lib/PlaYUVerFrame.h b/lib/PlaYUVerFrame.h
index 2a5fb87..6c2b157 100644
--- a/lib/PlaYUVerFrame.h
+++ b/lib/PlaYUVerFrame.h
@@ -142,7 +142,14 @@ public:
   }
   Bool haveSameFmt( PlaYUVerFrame* other ) const
   {
-    return ( m_uiWidth == other->getWidth() ) && ( m_uiHeight == other->getHeight() ) && ( m_iPixelFormat == other->getPelFormat() );
+    if( other )
+    {
+      return ( m_uiWidth == other->getWidth() ) && ( m_uiHeight == other->getHeight() ) && ( m_iPixelFormat == other->getPelFormat() );
+    }
+    else
+    {
+      return false;
+    }
   }
   Pel*** getPelBufferYUV() const
   {