Make the flasher close the serial connection on error

loucass003 · Oct 7, 2023 · e4fd25e · e4fd25e
1 parent 01e6577
commit e4fd25e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/main/kotlin/Flasher.kt b/src/main/kotlin/Flasher.kt
@@ -147,21 +147,21 @@ class Flasher(
         // TODO add checks if binaries are overlapping
 
         serialInterface.openSerial(port);
+        try {
+            begin();
 
-        begin();
+            if (binsToFlash.isEmpty())
+                error("No binary added to the flasher")
 
-        if (binsToFlash.isEmpty())
-            error("No binary added to the flasher")
+            binsToFlash.sortedBy { it.first }.forEach { pair ->
+                writeBinToFlash(pair.second, pair.first);
+            }
 
-        binsToFlash.sortedBy { it.first }.forEach { pair ->
-            writeBinToFlash(pair.second, pair.first);
+            end();
+        } finally {
+            serialInterface.closeSerial();
+            flashing = false;
         }
-
-        end();
-
-        serialInterface.closeSerial();
-
-        flashing = false;
     }
 
     private fun flashBegin(size: Int, offset: Int) {