Mercurial > mplayer.hg

changeset 36456:514b38743990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix small bug with GUI_SET_STREAM. In case we've selected a playlist, we should "ignore" the passed data.
author ib
date Tue, 17 Dec 2013 22:27:13 +0000
parents c9fb71a139bb
children 31120561a9da
files gui/interface.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Dec 17 22:18:13 2013 +0000
+++ b/gui/interface.c	Tue Dec 17 22:27:13 2013 +0000
@@ -305,11 +305,11 @@
  */
 int gui(int what, void *data)
 {
-    stream_t *stream;
 #ifdef CONFIG_DVDREAD
     dvd_priv_t *dvd;
 #endif
     int msg, state;
+    stream_t *stream = NULL;
     sh_audio_t *sh_audio;
     mixer_t *mixer;
     plItem *next   = NULL;
@@ -602,9 +602,10 @@
 
         if (guiInfo.StreamType == STREAMTYPE_PLAYLIST)
             guiInfo.mpcontext->file_format = DEMUXER_TYPE_PLAYLIST;
-
+        else {
         stream = data;
         guiInfo.StreamType = stream->type;
+        }
 
         switch (guiInfo.StreamType) {
         case STREAMTYPE_FILE: