From 6b5b905b2a6bc901671ff35b6e92c81fb1881dc1 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 29 Aug 2017 16:25:20 -0700 Subject: [PATCH] Exit right away if the parent process died --- libraries/shared/src/SharedUtil.cpp | 6 +++--- libraries/shared/src/SharedUtil.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index 5f4adf9826..b27cb3fb1c 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -1081,7 +1081,7 @@ void setMaxCores(uint8_t maxCores) { void quitWithParentProcess() { if (qApp) { qDebug() << "Parent process died, quitting"; - qApp->quit(); + exit(0); } } @@ -1134,7 +1134,7 @@ QString GetLastErrorAsString() { return QString::fromStdString(message); } -HANDLE createJobObject() { +void *createJobObject() { HANDLE jobObject = CreateJobObject(nullptr, nullptr); if (jobObject == nullptr) { qWarning() << "Could NOT create job object:" << GetLastErrorAsString(); @@ -1155,7 +1155,7 @@ HANDLE createJobObject() { return jobObject; } -void addProcessToJobObject(HANDLE jobObject, DWORD processId) { +void addProcessToJobObject(void *jobObject, qint64 processId) { HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, processId); if (hProcess == nullptr) { qCritical() << "Could NOT open process" << GetLastErrorAsString(); diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h index 10bcc16212..238532ea96 100644 --- a/libraries/shared/src/SharedUtil.h +++ b/libraries/shared/src/SharedUtil.h @@ -240,8 +240,8 @@ void watchParentProcess(int parentPID); #ifdef _WIN32 -HANDLE createJobObject(); -void addProcessToJobObject(HANDLE jobObject, DWORD processId); +void *createJobObject(); +void addProcessToJobObject(void *jobObject, qint64 processId); #endif #endif // hifi_SharedUtil_h