Mercurial > hg > octave-lyh
comparison gui/src/MainWindow.h @ 13528:8b116446a904
Fixed race condition.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 20 Jul 2011 23:32:19 +0200 |
parents | 09d9cb7c3014 |
children | 8c7390b78911 |
comparison
equal
deleted
inserted
replaced
13527:3ec73e6b8cbe | 13528:8b116446a904 |
---|---|
115 bool m_isRunning; | 115 bool m_isRunning; |
116 }; | 116 }; |
117 | 117 |
118 class OctaveMainThread:public QThread | 118 class OctaveMainThread:public QThread |
119 { | 119 { |
120 Q_OBJECT public: | 120 Q_OBJECT |
121 public: | |
121 OctaveMainThread (QObject * parent):QThread (parent) | 122 OctaveMainThread (QObject * parent):QThread (parent) |
122 { | 123 { |
123 } | 124 } |
125 | |
126 signals: | |
127 void ready(); | |
128 | |
124 protected: | 129 protected: |
125 void run () | 130 void run () |
126 { | 131 { |
127 int argc = 3; | 132 int argc = 3; |
128 const char *argv[] = { "octave", "--interactive", "--line-editing" }; | 133 const char *argv[] = { "octave", "--interactive", "--line-editing" }; |
129 octave_main (argc, (char **) argv, 1); | 134 octave_main (argc, (char **) argv, 1); |
135 emit ready(); | |
130 main_loop (); | 136 main_loop (); |
131 clean_up_and_exit (0); | 137 clean_up_and_exit (0); |
132 } | 138 } |
133 }; | 139 }; |
134 | 140 |