From 09dc681eb84d3bc8a19071f327cb3ea750b7a816 Mon Sep 17 00:00:00 2001
From: jfrey <nomhad@gmail.com>
Date: Fri, 15 Jun 2018 15:56:27 +0300
Subject: [PATCH] devmode defaults rather than overwrites folders

---
 src/asset.cpp | 11 +++++++----
 src/main.cpp  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/asset.cpp b/src/asset.cpp
index 6c19f693..b3cadc76 100644
--- a/src/asset.cpp
+++ b/src/asset.cpp
@@ -28,10 +28,13 @@ static std::string localDir;
 
 void assetInit(bool devMode, std::string customGlobalDir, std::string customLocalDir) {
 	if (devMode) {
-		// Use current working directory if running in development mode
-		globalDir = ".";
-		localDir = ".";
-		return;
+		// Use current working directory by default if running in development mode
+		if (customGlobalDir.empty()) {
+			customGlobalDir = ".";
+		}
+		if (customLocalDir.empty()) {
+			customLocalDir = ".";
+		}
 	}
 
 	if (customGlobalDir.empty()) {
diff --git a/src/main.cpp b/src/main.cpp
index 6e38d3a6..71c37955 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
 	// Parse command line arguments
 	argagg::parser argparser {{
 		{ "help", {"-h", "--help"}, "shows this help message", 0},
-		{ "devmod", {"-d", "--devmod"}, "enables dev mode (supersedes local/global folders)", 0},
+		{ "devmod", {"-d", "--devmod"}, "enables dev mode (will default local/global folders to current folder)", 0},
 		{ "global", {"-g", "--globaldir"}, "set golbalDir", 1},
 		{ "local", {"-l", "--localdir"}, "set localDir", 1},
 		{ "port", {"-p", "--port"}, "Bridge port number", 1},