Skip to content

Commit 5f428f2

Browse files
author
telwertowski
committed
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.
git-svn-id: http://svn.osgeo.org/qgis/trunk@9159 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b981f3a commit 5f428f2

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/plugins/grass/qgsgrassshell.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools,
159159
QgsDebugMsg( QString( "master ttyname = %1" ).arg( ttyname( mFdMaster ) ) );
160160
QgsDebugMsg( QString( "slave ttyname = %1" ).arg( ttyname( fdSlave ) ) );
161161

162-
//close ( fdSlave ); // -> crash
162+
//::close( fdSlave ); // -> crash
163163

164164
// Fork slave and open shell
165165
int pid = fork();
@@ -176,12 +176,9 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools,
176176
QgsDebugMsg( "child ->" );
177177

178178
// TODO close all opened file descriptors - close(0)???
179-
#ifndef Q_OS_DARWIN
180-
// Makes child process unusable on Mac
181-
close( mFdMaster );
182-
#endif
179+
::close( mFdMaster );
183180

184-
//close ( fdSlave ); // -> freeze
181+
//::close( fdSlave ); // -> freeze
185182

186183
setsid();
187184
seteuid( 0 );

0 commit comments

Comments
 (0)