GRASS py modules returns 1 getting interface description (fix 4667)

qgis · Jan 17, 2012 · fdd98947d763af5023cbd70fb43750f7611ba8f0 · fdd9894
1 parent 35cd0b9
commit fdd98947d763af5023cbd70fb43750f7611ba8f0
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 src/plugins/grass/qgsgrassmodule.cpp
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -336,10 +336,12 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
 
   // ? Does binary on Win need .exe extension ?
   // Return code 255 (-1) was correct in GRASS < 6.1.0
+  // Return code 1 is the value (correct?) .py modules actually returns (see #4667)
   if ( !process.waitForStarted()
        || !process.waitForReadyRead()
        || !process.waitForFinished()
-       || ( process.exitCode() != 0 && process.exitCode() != 255 ) )
+       || ( process.exitCode() != 0 && process.exitCode() != 255 &&
+            ( !cmd.endsWith( ".py" ) || process.exitCode() != 1 ) ) )
   {
     QgsDebugMsg( "process.exitCode() = " + QString::number( process.exitCode() ) );
     QMessageBox::warning( 0, tr( "Warning" ),