Fixed 2 small startup bugs

Author: GuilhemSempere

src/CanvasController.js

@@ -633,15 +633,17 @@ export default class CanvasController {
       traitColors: (customColors == null ? {} : JSON.parse(customColors)),
     };
 
-    // We use trait values as keys in inner arrays for persisting to Local-storage, so we need to convert those back to list indexes on reload
-	Object.entries(settings.traitColors).forEach(([traitName, colorByValue]) => Object.entries(colorByValue)
-		.forEach(([traitValue, traitValueColor]) => {
-			var trait = this.dataSet.traits.get(traitName), traitValueIndex = trait == null ? -1 : trait.values.indexOf(traitValue), traitColorMap = settings.traitColors[traitName];
-			if (traitValueIndex != -1)
-				traitColorMap[traitValueIndex] = traitValueColor;
-			delete traitColorMap[traitValue];
-		}
-	));
+    if (displayTraitSelect != null) {
+	    // We use trait values as keys in inner arrays for persisting to Local-storage, so we need to convert those back to list indexes on reload
+		Object.entries(settings.traitColors).forEach(([traitName, colorByValue]) => Object.entries(colorByValue)
+			.forEach(([traitValue, traitValueColor]) => {
+				var trait = this.dataSet.traits.get(traitName), traitValueIndex = trait == null ? -1 : trait.values.indexOf(traitValue), traitColorMap = settings.traitColors[traitName];
+				if (traitValueIndex != -1)
+					traitColorMap[traitValueIndex] = traitValueColor;
+				delete traitColorMap[traitValue];
+			}
+		));
+	}
 
     switch (sortId) {
       case "importing":

src/GenotypeImporter.js

@@ -91,7 +91,7 @@ export default class GenotypeImporter {
     const lines = fileContents.split(/\r?\n/);
     this.totalLineCount = lines.length;
 
-    const batchSize = Math.floor(this.totalLineCount / 10);
+    const batchSize = Math.max(1, Math.floor((this.totalLineCount - 2) / 10));
     const self = this;
 
     // Throttle the advancementCallback to reduce frequent UI updates