3 files changed, 20 insertions, 11 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index fbf9b610c9..f1ef8634d5 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -46,11 +46,13 @@ extern int mplSubRender;
 
 void mplStop()
 {
- if ( !mplShMem->Playing ) return;
  mplShMem->Playing=0;
  mplShMem->TimeSec=0;
  mplShMem->Position=0;
  mplShMem->AudioType=0;
+ mplSubRender=1;
+ wsPostRedisplay( &appMPlayer.subWindow );
+ if ( !mplShMem->Playing ) return;
  if ( !appMPlayer.subWindow.isFullScreen )
   {
    wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
@@ -197,3 +199,9 @@ void EventHandling( void )
  wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
  if ( mplShMem->SkinChange ) { ChangeSkin(); mplShMem->SkinChange=0;  }
 }
+
+void mplResizeToMovieSize( unsigned int width,unsigned int height )
+{
+ if ( !appMPlayer.subWindow.isFullScreen )
+   wsResizeWindow( &appMPlayer.subWindow,width,height );
+}
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 8de211c51e..f286d1b934 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -4,8 +4,6 @@
 
 #include "./psignal.h"
 #include "./mplayer.h"
-#include "../wm/ws.h"
-#include "../app.h"
 
 typedef struct
 {
@@ -77,6 +75,7 @@ extern void mplFullScreen( void );
 extern void mplPlay( void );
 extern void mplPause( void );
 extern void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height );
+extern void mplResizeToMovieSize( unsigned int width,unsigned int height );
 
 extern void mplIncAudioBufDelay( void );
 extern void mplDecAudioBufDelay( void );
diff --git a/mplayer.c b/mplayer.c
index aed7728a50..d30fe452cc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1026,9 +1026,11 @@ current_module="init_libvo";
 #ifdef HAVE_NEW_GUI
    if ( use_gui )
     {
-     if ( !appMPlayer.subWindow.isFullScreen ) wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
-     moviewidth=screen_size_x=appMPlayer.subWindow.Width;
-     movieheight=screen_size_y=appMPlayer.subWindow.Height;
+//     if ( !appMPlayer.subWindow.isFullScreen ) 
+//     wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
+     mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
+     moviewidth=screen_size_x=sh_video->disp_w;
+     movieheight=screen_size_y=sh_video->disp_h;
     }
 #endif
 
@@ -1921,11 +1923,11 @@ goto_next_file:  // don't jump here after ao/vo/getch initialization!
       if(use_gui) 
        {
         mplStop();
-        mplSubRender=1;
-        wsPostRedisplay( &appMPlayer.subWindow );
-        mplShMem->TimeSec=0;
-        mplShMem->Position=0;       
-	mplShMem->FrameDrop=0;
+//        mplSubRender=1;
+//        wsPostRedisplay( &appMPlayer.subWindow );
+//        mplShMem->TimeSec=0;
+//        mplShMem->Position=0;       
+//	mplShMem->FrameDrop=0;
        }	
 #endif