Merge pull request #130 from pimsierhuis/switch

GenericGcodeDriver: Send postHttpUploadGcode before instead of after autoPlay
t-oster · Dec 28, 2019 · 8c366c2 · 8c366c2
2 parents dcb007c + a4a92f6
commit 8c366c2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/GenericGcodeDriver.java b/src/main/java/de/thomas_oster/liblasercut/drivers/GenericGcodeDriver.java
@@ -782,14 +782,14 @@ protected void disconnect(String jobname) throws IOException, URISyntaxException
     {
       out.close();
       http_upload(new URI(getHttpUploadUrl()), outputBuffer.toString("UTF-8"), jobname);
-      if (this.isAutoPlay())
-      {
-        http_play(jobname);
-      }
       if (this.getPostHttpUploadGcode() != null && !this.getPostHttpUploadGcode().equals(""))
       {
         http_commands(this.getPostHttpUploadGcode(), jobname);
       }
+      if (this.isAutoPlay())
+      {
+        http_play(jobname);
+      }
     }
     else
     {