From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 2 Nov 2011 11:43:00 +0000 (+0200)
Subject: Remove trailing / or \ in path_userdata (probably fixes world deletion on Windows)
X-Git-Tag: 0.3.1~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=03db16d55b87908f2a08f9431162316d02e66233;p=oweals%2Fminetest.git

Remove trailing / or \ in path_userdata (probably fixes world deletion on Windows)
---

diff --git a/src/porting.cpp b/src/porting.cpp
index 217f0926e..f349c0ce5 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -129,8 +129,8 @@ void initializePaths()
 	// Use "./bin/../data"
 	path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
 		
-	// Use "./bin/../"
-	path_userdata = std::string(buf) + DIR_DELIM ".." DIR_DELIM;
+	// Use "./bin/.."
+	path_userdata = std::string(buf) + DIR_DELIM "..";
 
 	/*
 		Linux
@@ -149,7 +149,7 @@ void initializePaths()
 	path_data = std::string(buf) + "/../data";
 		
 	// Use "./bin/../"
-	path_userdata = std::string(buf) + "/../";
+	path_userdata = std::string(buf) + "/..";
 	
 	/*
 		OS X
@@ -160,7 +160,7 @@ void initializePaths()
 	dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
 			<<std::endl;
 	path_data = std::string("../data");
-	path_userdata = std::string("../");
+	path_userdata = std::string("..");
 
 	#endif