this patch fixes latest bug, discovered by .so ... (relative filenames &

playlists) This affects also the gui (filenames with space)
patch by Fabian Franz <FabianFranz@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9302 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 15 insertions, 0 deletions

diff --git a/mplayer.c b/mplayer.c
index c20cc0bfce..796bb6e403 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -582,6 +582,8 @@ static int libmpdemux_was_interrupted(int eof) {
 
 int playtree_add_playlist(play_tree_t* entry)
 {
+  play_tree_add_bpf(entry,filename);
+
 #ifdef HAVE_NEW_GUI
   if (use_gui) {
     if (entry) {
@@ -759,9 +761,22 @@ int gui_no_filename=0;
       use_gui=0;
     }
     if (use_gui && playtree_iter){
+      char* cwd;
       // Remove Playtree and Playtree-Iter from memory as its not used by gui
       play_tree_iter_free(playtree_iter);
       playtree_iter=NULL;
+      
+      if ((cwd=get_current_dir_name()))
+      {
+	cwd=(char*)realloc(cwd, strlen(cwd)+2);
+	if (cwd)
+        {
+	  strcat(cwd, "/");
+          // Prefix relative paths with current working directory
+          play_tree_add_bpf(playtree, cwd);
+	  free(cwd);
+	}
+      }      
       // Import initital playtree into gui
       import_initial_playtree_into_gui(playtree, mconfig, enqueue);
     }