diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-16 07:15:42 -0500 |
|---|---|---|
| committer | Chris Craig <ext-chris.craig@nokia.com> | 2012-02-16 15:41:33 +0100 |
| commit | 7496a35a5cf1480efab3a8f1c7f4ca80858a4f06 (patch) | |
| tree | ca391f2f220af84cb194809e720b88754fa174b8 /src/core/unixprocessbackend.cpp | |
| parent | 3e83f8581b34aa81db584b2199481ba49310210d (diff) | |
Updated METATYPE declarations, fixed tests, fixed sandbox
* Updated macros for DECLARE_METATYPE to avoid QML problems
* Updated module dependencies
* Moved socket names into QML-friendly attributes
* Fixed PGRP bug where kill command might be issued before setpgrp
* Cleaned up test code
Change-Id: I96e485bd2e95f8e186766692ce322ddb5c2ea527
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>
Diffstat (limited to 'src/core/unixprocessbackend.cpp')
| -rw-r--r-- | src/core/unixprocessbackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/unixprocessbackend.cpp b/src/core/unixprocessbackend.cpp index 3760354..0084132 100644 --- a/src/core/unixprocessbackend.cpp +++ b/src/core/unixprocessbackend.cpp @@ -53,10 +53,10 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER static void sendSignalToProcess(pid_t pid, int sig) { pid_t pgrp = ::getpgid(pid); - if (pgrp != -1 && ::killpg(pgrp, sig) == 0) + if (pgrp != -1 && pgrp != ::getpgrp() && ::killpg(pgrp, sig) == 0) return; - qWarning("Unable terminate process group: %d, switching to process %d", pgrp, pid); + qWarning("Unable terminate process group: %d, directly killing process %d", pgrp, pid); ::kill(pid, sig); } |