Skip to content

allow 'Allow machine to sleep' to work if 'Allow screen saver to star… #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

allow 'Allow machine to sleep' to work if 'Allow screen saver to star… #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
797f822
allow 'Allow machine to sleep' to work if 'Allow screen saver to star…
rdp Dec 15, 2017
a0c6123
cleanup same variables
rdp Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OSXvnc-server/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(),
Expand Down