summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gui/mplayer/play.c2
-rw-r--r--mplayer.c17
2 files changed, 11 insertions, 8 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 8ec67641bc..f6212c2691 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -58,6 +58,8 @@ printf("%%%%%% STOP \n");
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
}
+ mplSubRender=1;
+ wsPostRedisplay( &appMPlayer.subWindow );
}
void mplPlay( void )
diff --git a/mplayer.c b/mplayer.c
index ea797b9038..4d665248bd 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1840,9 +1840,6 @@ mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
}
-#ifdef HAVE_NEW_GUI
- if(use_gui) mplShMem->Playing=0;
-#endif
if(curr_filename+1<num_filenames || use_gui){
// partial uninit:
@@ -1858,16 +1855,20 @@ if(curr_filename+1<num_filenames || use_gui){
if(video_out) video_out->uninit();
#endif
-#ifdef HAVE_NEW_GUI
- mplSubRender=1;
- wsPostRedisplay( &appMPlayer.subWindow );
-#endif
-
current_module="uninit_ao";
if(audio_out) audio_out->uninit();
// if(encode_name) avi_fixate();
}
+#ifdef HAVE_NEW_GUI
+ if(use_gui)
+ {
+ mplStop();
+ mplSubRender=1;
+ wsPostRedisplay( &appMPlayer.subWindow );
+ }
+#endif
+
goto_next_file: // don't jump here after ao/vo/getch initialization!
if(use_gui || ++curr_filename<num_filenames){