From 99a45275ffccc82c775068ecba4359b34b4e2602 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Wed, 8 Jan 2020 00:52:25 +0200
Subject: [PATCH] Closes #112

---
 Scripts/Import.gd                   | 11 ++++++-----
 Scripts/Palette/PaletteContainer.gd |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Scripts/Import.gd b/Scripts/Import.gd
index b2893b7..e345d81 100644
--- a/Scripts/Import.gd
+++ b/Scripts/Import.gd
@@ -72,12 +72,13 @@ func import_gpl(path : String) -> Palette:
 				comments += line.trim_prefix('#') + '\n'
 				pass
 			elif line_number > 0 && line.length() >= 12:
-				var red : float = line.substr(0, 4).to_float() / 255.0
-				var green : float = line.substr(4, 4).to_float() / 255.0
-				var blue : float = line.substr(8, 4).to_float() / 255.0
-				var name : String = line.substr(12, line.length() - 12)
+				line = line.replace("\t", " ")
+				var color_data : PoolStringArray = line.split(" ", false, 4)
+				var red : float = color_data[0].to_float() / 255.0
+				var green : float = color_data[1].to_float() / 255.0
+				var blue : float = color_data[2].to_float() / 255.0
 				var color = Color(red, green, blue)
-				result.add_color(color, name)
+				result.add_color(color, color_data[3])
 			line_number += 1
 
 		if result:
diff --git a/Scripts/Palette/PaletteContainer.gd b/Scripts/Palette/PaletteContainer.gd
index a420708..bb3e37f 100644
--- a/Scripts/Palette/PaletteContainer.gd
+++ b/Scripts/Palette/PaletteContainer.gd
@@ -54,7 +54,7 @@ func on_palette_import_file_selected(path : String) -> void:
 			on_palette_select(palette.name)
 			save_palette(palette.name, palette.name + ".json")
 		else:
-			Global.error_dialog.set_text("Palette named '" + palette.name + "' already exists");
+			Global.error_dialog.set_text("Palette named '" + palette.name + "' already exists")
 			Global.error_dialog.popup_centered()
 	else:
 		Global.error_dialog.set_text("Invalid Palette file!")