Merge branch 'release/2.1.5'

MiniZinc · May 17, 2017 · 7905f2a · 7905f2a
2 parents c79168e + 7e8c2fa
commit 7905f2a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/MiniZincIDE/CHANGES b/MiniZincIDE/CHANGES
@@ -1,3 +1,8 @@
+2017-05-17
+  v2.1.5
+  - Update to MiniZinc 2.1.5.
+  - Fix an issue where solver output may not get printed if it occurs too
+    quickly after the solver has started.
 2017-03-16
   v2.1.4
   - Update to MiniZinc 2.1.4.

diff --git a/MiniZincIDE/MiniZincIDE.pro b/MiniZincIDE/MiniZincIDE.pro
@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.1.4
+VERSION = 2.1.5
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

diff --git a/MiniZincIDE/mainwindow.cpp b/MiniZincIDE/mainwindow.cpp
@@ -1928,7 +1928,7 @@ void MainWindow::outputProcFinished(int, bool showTime) {
 }
 
 void MainWindow::procFinished(int, bool showTime) {
-    if (outputProcess && outputProcess->state()==QProcess::Running) {
+    if (outputProcess && outputProcess->state()!=QProcess::NotRunning) {
         connect(outputProcess, SIGNAL(finished(int)), this, SLOT(outputProcFinished(int)));
         outputProcess->closeWriteChannel();
         return;