[QGIS Commit] r13475 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-13 12:51:23 -0400 (Thu, 13 May 2010)
New Revision: 13475

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
Log:
next take on #2620 - not reproducable here

Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-05-13 09:47:48 UTC (rev 13474)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-05-13 16:51:23 UTC (rev 13475)
@@ -333,7 +333,9 @@
 
   // ? Does binary on Win need .exe extension ?
   // Return code 255 (-1) was correct in GRASS < 6.1.0
-  if ( !process.waitForFinished()
+  if ( !process.waitForStarted()
+       || !process.waitForReadyRead()
+       || !process.waitForFinished()
        || ( process.exitCode() != 0 && process.exitCode() != 255 ) )
   {
     QgsDebugMsg( "process.exitCode() = " + QString::number( process.exitCode() ) );