From f308192f547b5fb33ed4cb9fa0529a138a615575 Mon Sep 17 00:00:00 2001 From: Paper Date: Sat, 2 Sep 2023 15:27:58 -0400 Subject: [PATCH] win32: print to the terminal if disabling sleep fails --- src/Context.cc | 3 ++- src/prefs.cc | 4 +++- src/prefs.h | 2 ++ src/usage_text.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Context.cc b/src/Context.cc index 0930ae14..9cbcfe6c 100644 --- a/src/Context.cc +++ b/src/Context.cc @@ -223,7 +223,8 @@ Context::Context(bool standalone, int argc, char** argv, const KeyVals& options) } #ifdef _WIN32 if (op->getAsBool(PREF_DISABLE_SLEEP)) { - SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + if (!SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED)) + A2_LOG_WARN("--disable-sleep-until-finished: Failed to disable sleep mode."); } #endif // _WIN32 SocketCore::setIpDscp(op->getAsInt(PREF_DSCP)); diff --git a/src/prefs.cc b/src/prefs.cc index 0e782391..332d190f 100644 --- a/src/prefs.cc +++ b/src/prefs.cc @@ -334,8 +334,10 @@ PrefPtr PREF_SHOW_CONSOLE_READOUT = makePref("show-console-readout"); PrefPtr PREF_STREAM_PIECE_SELECTOR = makePref("stream-piece-selector"); // value: true | false PrefPtr PREF_TRUNCATE_CONSOLE_READOUT = makePref("truncate-console-readout"); +#ifdef _WIN32 // value: true | false -PrefPtr PREF_DISABLE_SLEEP = makePref("disable-sleep-until-finished") +PrefPtr PREF_DISABLE_SLEEP = makePref("disable-sleep-until-finished"); +#endif // _WIN32 // value: true | false PrefPtr PREF_PAUSE = makePref("pause"); // value: default | full | hide diff --git a/src/prefs.h b/src/prefs.h index aa259f39..319a2fcb 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -287,8 +287,10 @@ extern PrefPtr PREF_SHOW_CONSOLE_READOUT; extern PrefPtr PREF_STREAM_PIECE_SELECTOR; // value: true | false extern PrefPtr PREF_TRUNCATE_CONSOLE_READOUT; +#ifdef _WIN32 // value: true | false extern PrefPtr PREF_DISABLE_SLEEP; +#endif // _WIN32 // value: true | false extern PrefPtr PREF_PAUSE; // value: default | full | hide diff --git a/src/usage_text.h b/src/usage_text.h index 329daa6e..cc0b0c99 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -885,7 +885,7 @@ _(" --truncate-console-readout[=true|false] Truncate console readout to fit in\n"\ " a single line.") #ifdef _WIN32 -#define TEXT_DISABLE_SLEEP +#define TEXT_DISABLE_SLEEP \ _(" --disable-sleep-until-finished[=true|false] Disables sleep mode on Windows\n" \ " until downloads are finished.") #endif // _WIN32