From f92154b2284981145bb0d0aae6d5cf53d946776b Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 9 Aug 2018 22:37:42 +0100
Subject: [PATCH] Slight bugfix in new preset mode

---
 SpritePacker-CLI/Program.cs  | 7 +++++--
 SpritePacker/SpritePacker.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/SpritePacker-CLI/Program.cs b/SpritePacker-CLI/Program.cs
index 6442157..91efe70 100644
--- a/SpritePacker-CLI/Program.cs
+++ b/SpritePacker-CLI/Program.cs
@@ -61,8 +61,10 @@ namespace SpritePacker
 						string presetFilename = args[++i];
 						if (File.Exists(presetFilename))
 							rawSourceLocations = File.ReadAllText(presetFilename);
-						else
+						else {
 							Console.Error.WriteLine("Warning: Couldn't find the preset csv file at {0}", presetFilename);
+							return 1;
+						}
 						break;
 					case "--csv":
 						outputFormat = OutputFormat.CSV;
@@ -120,7 +122,7 @@ namespace SpritePacker
 			// Preset some locations if they were specified
 			if (rawSourceLocations != null) {
 				foreach (string[] line in parseCSV(rawSourceLocations).Skip(1)) { // Skip the header
-				  // index,filename,x,y,width,height
+					// index,filename,x,y,width,height
 					Sprite currentSprite = sprites.Find((Sprite item) => item.Filename == line[1]);
 					currentSprite.Area = new Rectangle(
 						int.Parse(line[2]),
@@ -129,6 +131,7 @@ namespace SpritePacker
 						int.Parse(line[5])
 					);
 					currentSprite.Placed = true;
+					if(Verbose) Console.WriteLine("Pre-placing {0}", currentSprite);
 				}
 			}
 			spritePacker.Add(sprites);
diff --git a/SpritePacker/SpritePacker.cs b/SpritePacker/SpritePacker.cs
index 22d2e50..6625269 100644
--- a/SpritePacker/SpritePacker.cs
+++ b/SpritePacker/SpritePacker.cs
@@ -155,7 +155,7 @@ namespace SpritePacker
 								if (probSpr.Bottom > downProblem.Bottom)
 									downProblem = probSpr;
 								// If the current problem's right edge is further in than the current next scan line,
-								// move the enxt scan line up to meet it.
+								// move the next scan line up to meet it.
 								// Also make sure that the next scan line and the current scan line don't touch or cross.
 								if (probSpr.Right < nextScanLines.X && probSpr.Right > scanLines.X)
 									nextScanLines.X = probSpr.Right; // NOTE: Add one here?