From 797f822844cc8a0f4aaf60b7a36dde91eba99fa2 Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Fri, 15 Dec 2017 15:19:54 -0700 Subject: [PATCH 1/2] allow 'Allow machine to sleep' to work if 'Allow screen saver to start' is not checked --- OSXvnc-server/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OSXvnc-server/main.c b/OSXvnc-server/main.c index 6d84026..f0cbb69 100644 --- a/OSXvnc-server/main.c +++ b/OSXvnc-server/main.c @@ -1255,7 +1255,7 @@ int main(int argc, char *argv[]) { // Better to handle this at the event level, see kbdptr.c //CGEnableEventStateCombining(FALSE); - if (rfbDisableScreenSaver) { + if (rfbDisableScreenSaver || rfbNoSleep) { /* setup screen saver disabling timer */ screensaverTimerUPP = NewEventLoopTimerUPP(rfbScreensaverTimer); InstallEventLoopTimer(GetMainEventLoop(), From a0c6123465e98322351d3979c87c553b278a4ed1 Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Fri, 15 Dec 2017 15:35:08 -0700 Subject: [PATCH 2/2] cleanup same variables --- OSXvnc-server/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OSXvnc-server/main.c b/OSXvnc-server/main.c index f0cbb69..b7c6ffc 100644 --- a/OSXvnc-server/main.c +++ b/OSXvnc-server/main.c @@ -1047,7 +1047,7 @@ void rfbShutdown(void) { [[NSNotificationCenter defaultCenter] removeObserver:vncServerObject]; [[NSDistributedNotificationCenter defaultCenter] removeObserver:vncServerObject]; - if (rfbDisableScreenSaver) { + if (rfbDisableScreenSaver || rfbNoSleep) { /* remove the screensaver timer */ RemoveEventLoopTimer(screensaverTimer); DisposeEventLoopTimerUPP(screensaverTimerUPP);