X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2Futility.cpp;h=6d336672de217889888b26c8600cf3a5dbd8fb92;hb=388749ada52bb177370f4f58766458b030b8a50a;hp=ee88ea0d0dc880a20126d38c87a81085c08a6b4c;hpb=f3230836ca2e263e84b58ffec6645c0f77439117;p=l2e.git

diff --git a/src/loader/utility.cpp b/src/loader/utility.cpp
index ee88ea0..6d33667 100644
--- a/src/loader/utility.cpp
+++ b/src/loader/utility.cpp
@@ -15,22 +15,22 @@ using std::string;
 namespace loader {
 
 string Dirname(const string &path) {
-	// unix version
 	char *str(new char[path.size() + 1]);
 	std::memcpy(str, path.c_str(), path.size());
 	str[path.size()] = '\0';
 	string dn(dirname(str));
-	delete str;
+	delete[] str;
 	return dn;
 }
 
 string CatPath(const string &lhs, const string &rhs) {
-	// unix version
 	string path(lhs);
-	if (!path.empty() && path[path.size() - 1] != '/') {
+	if (!path.empty()
+			&& path[path.size() - 1] != '/'
+			&& path[path.size() - 1] != '\\') {
 		path += '/';
 	}
-	if (!rhs.empty() && rhs[0] == '/') {
+	if (!rhs.empty() && (rhs[0] == '/' || rhs[0] == '\\')) {
 		path.append(rhs, 1, string::npos);
 	} else {
 		path += rhs;