# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1302811364 -7200
# Node ID 604c37e8f38884ddfb408d61050f558842a64732
# Parent  ec0e771cc3489d7d1cecd0cf7206c557232576b7
Fixed crash after shutdown.

diff --git a/gui//src/MainWindow.cpp b/gui//src/MainWindow.cpp
--- a/gui//src/MainWindow.cpp
+++ b/gui//src/MainWindow.cpp
@@ -63,8 +63,14 @@
 }
 
 void MainWindow::closeEvent(QCloseEvent *closeEvent) {
+    m_isRunning = false;
     reportStatusMessage("Saving data and shutting down.");
     writeSettings();
+    m_octaveCallbackThread->terminate();
+    m_octaveCallbackThread->wait();
+
+    m_octaveMainThread->terminate();
+    m_octaveMainThread->wait();
     QMainWindow::closeEvent(closeEvent);
 }