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

[svn_qgis at osgeo.org]

Author: telwertowski
Date: 2008-08-24 17:09:20 -0400 (Sun, 24 Aug 2008)
New Revision: 9159

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
Log:
Better Mac fix for GRASS shell. Use global namespace qualifier so that system close rather then QWidget::close is linked to. The previous fix left an orphan pty on exit.


Modified: trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2008-08-24 21:05:26 UTC (rev 9158)
+++ trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2008-08-24 21:09:20 UTC (rev 9159)
@@ -159,7 +159,7 @@
   QgsDebugMsg( QString( "master ttyname = %1" ).arg( ttyname( mFdMaster ) ) );
   QgsDebugMsg( QString( "slave ttyname = %1" ).arg( ttyname( fdSlave ) ) );
 
-  //close ( fdSlave ); // -> crash
+  //::close( fdSlave ); // -> crash
 
   // Fork slave and open shell
   int pid = fork();
@@ -176,12 +176,9 @@
     QgsDebugMsg( "child ->" );
 
     // TODO close all opened file descriptors - close(0)???
-#ifndef Q_OS_DARWIN
-    // Makes child process unusable on Mac
-    close( mFdMaster );
-#endif
+    ::close( mFdMaster );
 
-    //close ( fdSlave ); // -> freeze
+    //::close( fdSlave ); // -> freeze
 
     setsid();
     seteuid( 0 );