Merge remote-tracking branch 'Tainfante_origin/master'

tainfante · Jan 24, 2018 · a01f16f · a01f16f
2 parents 13a08c7 + 712b001
commit a01f16f
Show file tree

Hide file tree

Showing 5 changed files with 262 additions and 221 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -6,6 +6,7 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import mainwindow.CaptureController;
+import plot.Plot;
 import port.PortReader;
 
 public class Main extends Application
@@ -25,6 +26,7 @@ public void start(Stage primaryStage) throws Exception
         {
             CaptureController.isActiveExport = false;
             PortReader.getInstance().setStopReading(true);
+            Plot.getInstance().setStopPlotting(true);
         });
 
         primaryStage.show();