[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57261] trunk/blender/source/blender/ editors/space_file/filesel.c: Merge branch 'FIX_Previous_Folder' into trunk

[Nicholas Rishel]

Revision: 57261
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57261
Author:   nicholas_rishel
Date:     2013-06-06 02:13:56 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Merge branch 'FIX_Previous_Folder' into trunk

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/filesel.c

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2013-06-06 02:13:32 UTC (rev 57260)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2013-06-06 02:13:56 UTC (rev 57261)
@@ -254,6 +254,8 @@
 	/* initialize the list with previous folders */
 	if (!sfile->folders_prev)
 		sfile->folders_prev = folderlist_new();
+	if (!sfile->params->dir[0])
+		BLI_cleanup_dir(G.main->name, sfile->params->dir);
 	folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
 
 	/* switching thumbnails needs to recalc layout [#28809] */