Merge upstream

2025-02-25 05:11:35 +08:00
parent 51602b1c39 e3079da132
commit 1cdd309cfd
12 changed files with 54 additions and 46 deletions
--- a/src/display_device.cpp
+++ b/src/display_device.cpp
@@ -621,7 +621,7 @@ namespace display_device {
          std::make_shared<FileSettingsPersistence>(persistence_filepath)
        ),
        WinWorkarounds {
-          .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle ? std::make_optional(500ms) : std::nullopt
+          .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle_delay != std::chrono::milliseconds::zero() ? std::make_optional(video_config.dd.wa.hdr_toggle_delay) : std::nullopt
        }
      );
 #else