Mercurial > octave-nkf

changeset 14694:ea11c9d8aa47 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 28 May 2012 00:39:57 +0200
parents c952f1e35e50
children 55f88d2236b6
files gui/src/MainWindow.cpp gui/src/backend/OctaveLink.cpp
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 
   /*
--- 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