From e4220b176525d186fa2fa27827a362189409cffa Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Fri, 24 Jan 2020 12:51:18 +0100
Subject: [PATCH] Improve config handling

---
 Sources/Main.hx       | 9 +++------
 Sources/arm/Config.hx | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Sources/Main.hx b/Sources/Main.hx
index a9421f2f..21335bb0 100644
--- a/Sources/Main.hx
+++ b/Sources/Main.hx
@@ -21,6 +21,7 @@ class Main {
 	static var tasks: Int;
 
 	public static function main() {
+		Krom.setApplicationName("ArmorPaint");
 		tasks = 1;
 		tasks++; Config.load(function() { tasks--; start(); });
 		#if arm_physics
@@ -47,7 +48,7 @@ class Main {
 		if (lasti >= 0) title = title.substr(lasti + 1);
 		if (title.endsWith(".exe")) title = title.substr(0, title.length - 4);
 		#else
-		var title = "ArmorPaint";
+		var title = "untitled - ArmorPaint";
 		#end
 
 		var options: kha.SystemOptions = {
@@ -67,13 +68,9 @@ class Main {
 		};
 
 		System.start(options, function(window: Window) {
-			#if (!arm_player)
-			kha.Window.get(0).title = "untitled - ArmorPaint";
-			#end
+			Krom.setApplicationName("ArmorPaint");
 			iron.App.init(function() {
 				Scene.setActive("Scene", function(o: Object) {
-					if (Path.isProtected()) Config.load(function() {}, true);
-					Config.init();
 					Uniforms.init();
 					var path = new RenderPath();
 					Inc.init(path);
diff --git a/Sources/arm/Config.hx b/Sources/arm/Config.hx
index 72957fe2..be34b5e1 100644
--- a/Sources/arm/Config.hx
+++ b/Sources/arm/Config.hx
@@ -17,9 +17,9 @@ class Config {
 	public static var keymap: Dynamic;
 	public static var configLoaded = false;
 
-	public static function load(done: Void->Void, fromSavePath = false) {
+	public static function load(done: Void->Void) {
 		try {
-			Data.getBlob((fromSavePath ? Krom.savePath() : "") + "config.arm", function(blob: kha.Blob) {
+			Data.getBlob((Path.isProtected() ? Krom.savePath() : "") + "config.arm", function(blob: kha.Blob) {
 				configLoaded = true;
 				raw = Json.parse(blob.toString());
 				done();