Do not crash when importing non-utf8 .txt files

armory3d · May 14, 2023 · 5759780 · 5759780
1 parent c618aaa
commit 5759780
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/armorpaint/Assets/plugins/import_txt.js b/armorpaint/Assets/plugins/import_txt.js
diff --git a/armorlab/Assets/plugins/import_txt.js → base/Assets/plugins/import_txt.js b/armorlab/Assets/plugins/import_txt.js → base/Assets/plugins/import_txt.js
@@ -2,9 +2,14 @@
 let import_txt = function(path, done) {
 	iron.Data.getBlob(path, function(b) {
 		var filename = path.split('\\').pop().split('/').pop();
-		arm.UIBox.showMessage(filename, b.toString(), true);
-		arm.UIBox.clickToHide = false;
-		iron.Data.deleteBlob(path);
+		try {
+			arm.UIBox.showMessage(filename, b.toString(), true);
+			arm.UIBox.clickToHide = false;
+			iron.Data.deleteBlob(path);
+		}
+		catch(e) {
+			console.error(e);
+		}
 	});
 }
 

diff --git a/base/khafile.js b/base/khafile.js
@@ -21,6 +21,7 @@ project.addShaders("Shaders/*.glsl", { embed: flags.snapshot });
 project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot });
 project.addAssets("Assets/locale/*", { destination: "data/locale/{name}" });
 project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" });
+project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" });
 project.addAssets("Assets/themes/*.json", { destination: "data/themes/{name}" });
 
 if (flags.snapshot) {