#6346 Make server bypass lock to screen if it's disable from config option

# Conflicts:
#	src/lib/server/Server.cpp
#	src/lib/server/Server.h
This commit is contained in:
XinyuHou
2016-11-24 12:22:39 +00:00
committed by Nick Bolton
parent 535627c871
commit 84dfeec2ed
4 changed files with 16 additions and 1 deletions

View File

@@ -765,10 +765,12 @@ Config::readSectionOptions(ConfigReadContext& s)
else if (name == "win32KeepForeground") {
addOption("", kOptionWin32KeepForeground, s.parseBoolean(value));
}
else if (name == "disableLockToScreen") {
addOption("", kOptionDisableLockToScreen, s.parseBoolean(value));
}
else if (name == "clipboardSharing") {
addOption("", kOptionClipboardSharing, s.parseBoolean(value));
}
else {
handled = false;
}
@@ -1380,6 +1382,9 @@ Config::getOptionName(OptionID id)
if (id == kOptionScreenPreserveFocus) {
return "preserveFocus";
}
if (id == kOptionDisableLockToScreen) {
return "disableLockToScreen";
}
if (id == kOptionClipboardSharing) {
return "clipboardSharing";
}