Merge branch 'release/2.0.13'

MiniZinc · Mar 26, 2016 · 3e1cc36 · 3e1cc36
2 parents b4f28ac + 8cbed2b
commit 3e1cc36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/MiniZincIDE/mainwindow.cpp b/MiniZincIDE/mainwindow.cpp
@@ -1875,7 +1875,9 @@ void MainWindow::procFinished(int, bool showTime) {
     process = NULL;
     if (outputProcess) {
         outputProcess->closeWriteChannel();
+        outputProcess->waitForBytesWritten();
         outputProcess->waitForFinished();
+        readOutput();
         outputProcess = NULL;
         finishJSONViewer();
         inJSONHandler = false;

diff --git a/MiniZincIDE/solverdialog.cpp b/MiniZincIDE/solverdialog.cpp
@@ -260,7 +260,7 @@ void MznProcess::start(const QString &program, const QStringList &arguments, con
 #else
     setenv("PATH", (addPath + pathSep + curPath).toStdString().c_str(), 1);
 #endif
-    QProcess::start(program,arguments);
+    QProcess::start(program,arguments, QIODevice::Unbuffered | QIODevice::ReadWrite);
 #ifdef Q_OS_WIN
     _putenv_s("PATH", curPath.toStdString().c_str());
 #else