Mercurial > octave-nkf

changeset 13526:7b0a721d0ae8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with bitbucket.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 20 Jul 2011 22:44:31 +0200
parents 2426dd43c593 (diff) 8c143d6d0330 (current diff)
children 3ec73e6b8cbe
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/MainWindow.cpp	Wed Jul 20 21:23:07 2011 +0200
+++ b/gui/src/MainWindow.cpp	Wed Jul 20 22:44:31 2011 +0200
@@ -61,8 +61,6 @@
       FileEditorMdiSubWindow *subWindow =
 	new FileEditorMdiSubWindow (m_centralMdiArea);
       subWindow->setAttribute (Qt::WA_DeleteOnClose);
-// addSubWindow uncommented to avoid "QMdiArea::addSubWindow: window is already added"
-//        m_centralMdiArea->addSubWindow(subWindow);
       subWindow->loadFile (fileName);
     }
 }
@@ -276,12 +274,12 @@
 void
 MainWindow::establishOctaveLink ()
 {
+  m_octaveTerminal->openTerminal ();
+
   m_octaveMainThread = new OctaveMainThread (this);
   m_octaveMainThread->start ();
 
   m_octaveCallbackThread = new OctaveCallbackThread (this, this);
   m_octaveCallbackThread->start ();
-
-  m_octaveTerminal->openTerminal ();
   reportStatusMessage (tr ("Established link to Octave."));
 }