[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36100] trunk/blender/source/blender/ blenlib/intern/path_util.c: error in previous commit

[Campbell Barton]

Revision: 36100
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36100
Author:   campbellbarton
Date:     2011-04-11 14:43:01 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
error in previous commit 

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2011-04-11 13:56:58 UTC (rev 36099)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-04-11 14:43:01 UTC (rev 36100)
@@ -880,12 +880,17 @@
 #ifdef PATH_DEBUG2
 	printf("get_path_local...\n");
 #endif
-	
-	if (subfolder_name) {
-		BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
-	} else {
-		BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
+
+	if(folder_name) {
+		if (subfolder_name) {
+			BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
+		} else {
+			BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
+		}
 	}
+	else {
+		relfolder[0]= '\0';
+	}
 	
 	/* use argv[0] (bprogname) to get the path to the executable */
 	BLI_split_dirfile(bprogname, bprogdir, NULL);