Index: gui/win32/interface.c
===================================================================
--- gui/win32/interface.c	(revision 34139)
+++ gui/win32/interface.c	(working copy)
@@ -466,9 +466,9 @@
 #endif
             }
             if(guiInfo.Filename)
-                filename = strdup(guiInfo.Filename);
+                setdup(&filename, guiInfo.Filename);
             else if(filename)
-                strcpy(guiInfo.Filename, filename);
+                setdup(&guiInfo.Filename, filename);
             break;
         }
         case GUI_SET_AUDIO:
@@ -605,7 +605,9 @@
             dvd_title = 0;
             force_fps = 0;
             if(!mygui->playlist->tracks) return 0;
-            filename = guiInfo.Filename = mygui->playlist->tracks[mygui->playlist->current]->filename;
+            setdup(&guiInfo.Filename, mygui->playlist->tracks[mygui->
+                playlist->current]->filename);
+            setdup(&filename, guiInfo.Filename);
             guiInfo.Track = mygui->playlist->current + 1;
             if(gtkAONorm) greplace(&af_cfg.list, "volnorm", "volnorm");
             if(gtkAOExtraStereo)
@@ -726,17 +728,18 @@
 int guiPlaylistInitialize(play_tree_t *my_playtree, m_config_t *config, int enqueue)
 {
     play_tree_iter_t *my_pt_iter = NULL;
+    char *filen;
     int result = 0;
 
     if(!mygui) guiInit();
 
     if((my_pt_iter = pt_iter_create(&my_playtree, config)))
     {
-        while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL)
+        while ((filen = pt_iter_get_next_file(my_pt_iter)) != NULL)
         {
-            if (parse_filename(filename, my_playtree, config, 0))
+            if (parse_filename(filen, my_playtree, config, 0))
                 result = 1;
-            else if (import_file_into_gui(filename, 0)) /* Add it to end of list */
+            else if (import_file_into_gui(filen, 0)) /* Add it to end of list */
                 result = 1;
         }
     }
@@ -745,7 +748,7 @@
     if (result)
     {
         mygui->playlist->current = 0;
-        filename = mygui->playlist->tracks[0]->filename;
+        setdup(&filename, mygui->playlist->tracks[0]->filename);
     }
     return result;
 }
