# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1303066898 -7200
# Node ID 0659ca41b3ded163f9e6017e55ac6bc80374d4a6
# Parent  e66dbc6485f2b9c472776d2b0860971c2c07fc63
Repaired syntax highlighting.

diff --git a/gui//src/MainWindow.cpp b/gui//src/MainWindow.cpp
--- a/gui//src/MainWindow.cpp
+++ b/gui//src/MainWindow.cpp
@@ -66,11 +66,11 @@
     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);
 }
 
diff --git a/gui//src/Session.cpp b/gui//src/Session.cpp
--- a/gui//src/Session.cpp
+++ b/gui//src/Session.cpp
@@ -596,7 +596,7 @@
 
   //FIXME: Make message text for this notification and the activity notification more descriptive.    
   if (_monitorSilence) {
-    //KNotification::event("Silence", i18n("Silence in session '%1'", _nameTitle), QPixmap(),
+    //KNotification::event("Silence", i18n("Silence in session '%1'", _nameTitle)propagateSize, QPixmap(),
     //                QApplication::activeWindow(),
     //                KNotification::CloseWhenWidgetActivated);
     emit stateChanged(NOTIFYSILENCE);
diff --git a/gui//src/SimpleEditor.cpp b/gui//src/SimpleEditor.cpp
--- a/gui//src/SimpleEditor.cpp
+++ b/gui//src/SimpleEditor.cpp
@@ -46,7 +46,7 @@
 }
 
 void SimpleEditor::loadSyntaxXMLDescription() {
-    QString installPath = QString("syntax_files")
+    QString installPath = QString("../syntax_files")
         + QDir::separator();
 
     QFileInfo file(m_currentFileName);