# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1338158397 -7200
# Node ID ea11c9d8aa470e90960e841e9f4f0e4c6a135d01
# Parent  c952f1e35e50c2911bdd09625b26e5e5ebad63cb
Calling qApp->quit () via QMetaObject::invoke caused a segfault, now exits cleanly.

* OctaveLink (terminateOctave): Changed quit() call to direct method call.
* MainWindow: Added object name for QTerminal.

diff -r c952f1e35e50 -r ea11c9d8aa47 gui/src/MainWindow.cpp
--- a/gui/src/MainWindow.cpp	Sun May 27 23:42:00 2012 +0200
+++ b/gui/src/MainWindow.cpp	Mon May 28 00:39:57 2012 +0200
@@ -194,6 +194,7 @@
   QSettings *settings = ResourceManager::instance ()->settings ();
   settings->setValue ("MainWindow/geometry", saveGeometry ());
   settings->setValue ("MainWindow/windowState", saveState ());
+  settings->sync ();
 }
 
 void
@@ -224,6 +225,7 @@
 
   // Octave Terminal subwindow.
   m_terminal = new QTerminal(this);
+  m_terminal->setObjectName ("OctaveTerminal");
   m_terminalDockWidget = new TerminalDockWidget (m_terminal, this);
 
   /*
diff -r c952f1e35e50 -r ea11c9d8aa47 gui/src/backend/OctaveLink.cpp
--- a/gui/src/backend/OctaveLink.cpp	Sun May 27 23:42:00 2012 +0200
+++ b/gui/src/backend/OctaveLink.cpp	Mon May 28 00:39:57 2012 +0200
@@ -72,7 +72,7 @@
 void
 OctaveLink::terminateOctave ()
 {
-  QMetaObject::invokeMethod (qApp, "quit");
+  qApp->quit ();
 }
 
 void