[MPlayer-cvslog] r36552 - trunk/gui/interface.c

[ib]

Author: ib
Date: Tue Dec 17 23:27:13 2013
New Revision: 36552

Log:
Fix small bug with GUI_SET_STREAM.

In case we've selected a playlist,
we should "ignore" the passed data.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Dec 17 23:18:13 2013	(r36551)
+++ trunk/gui/interface.c	Tue Dec 17 23:27:13 2013	(r36552)
@@ -305,11 +305,11 @@ static void add_vf(char *str)
  */
 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 @@ int gui(int what, void *data)
 
         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: