Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use negative PID hack in GUI neither, add a separate flag to wxEndProcessData for this

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-22 15:37:16 +00:00
parent 69328170cc
commit e528a71bf1
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/unix/utilsunx.cpp
View File

@@ -1412,18 +1412,24 @@ int wxAppTraits::WaitForChild(wxExecuteData& execData)
{
if ( !(execData.flags & wxEXEC_SYNC) )
{
// asynchronous execution: just launch the process and return
// asynchronous execution: just launch the process and return,
// endProcData will be destroyed when it terminates (currently we leak
// it if the process doesn't terminate before we do and this should be
// fixed but it's not a real leak so it's not really very high
// priority)
wxEndProcessData *endProcData = new wxEndProcessData;
endProcData->process = execData.process;
endProcData->pid = execData.pid;
endProcData->process = execData.process;
endProcData->pid = execData.pid;
endProcData->tag = AddProcessCallback
(
endProcData,
execData.GetEndProcReadFD()
);
endProcData->async = true;
return execData.pid;
}
//else: synchronous execution case
#if wxUSE_STREAMS
wxProcess * const process = execData.process;
@@ -1464,9 +1470,16 @@ void wxHandleProcessTermination(wxEndProcessData *data)
data->process->OnTerminate(data->pid, data->exitcode);
}
// this function is only called for asynchronously executing children, now
// that we have received the notification about their termination there is
// no need to keep it around any longer
delete data;
if ( data->async )
{
// in case of asynchronous execution we don't need this data any more
// after the child terminates
delete data;
}
else // sync execution
{
// let wxExecute() know that the process has terminated
data->pid = 0;
}
}