diff --git a/src/core/hyprlock.cpp b/src/core/hyprlock.cpp index 39c4e0f..25f1276 100644 --- a/src/core/hyprlock.cpp +++ b/src/core/hyprlock.cpp @@ -35,7 +35,7 @@ static void setMallocThreshold() { #endif } -CHyprlock::CHyprlock(const std::string& wlDisplay, const bool immediate, const bool immediateRender, const int graceSeconds) { +CHyprlock::CHyprlock(const std::string& wlDisplay, const bool immediateRender, const int graceSeconds) { setMallocThreshold(); m_sWaylandState.display = wl_display_connect(wlDisplay.empty() ? nullptr : wlDisplay.c_str()); @@ -43,10 +43,7 @@ CHyprlock::CHyprlock(const std::string& wlDisplay, const bool immediate, const b g_pEGL = makeUnique(m_sWaylandState.display); - if (!immediate) { - m_tGraceEnds = graceSeconds ? std::chrono::system_clock::now() + std::chrono::seconds(graceSeconds) : std::chrono::system_clock::from_time_t(0); - } else - m_tGraceEnds = std::chrono::system_clock::from_time_t(0); + m_tGraceEnds = graceSeconds ? std::chrono::system_clock::now() + std::chrono::seconds(graceSeconds) : std::chrono::system_clock::from_time_t(0); static const auto IMMEDIATERENDER = g_pConfigManager->getValue("general:immediate_render"); m_bImmediateRender = immediateRender || *IMMEDIATERENDER; diff --git a/src/core/hyprlock.hpp b/src/core/hyprlock.hpp index ff5fbcc..e58acf3 100644 --- a/src/core/hyprlock.hpp +++ b/src/core/hyprlock.hpp @@ -29,7 +29,7 @@ struct SDMABUFModifier { class CHyprlock { public: - CHyprlock(const std::string& wlDisplay, const bool immediate, const bool immediateRender, const int gracePeriod); + CHyprlock(const std::string& wlDisplay, const bool immediateRender, const int gracePeriod); ~CHyprlock(); void run(); diff --git a/src/main.cpp b/src/main.cpp index 2c1bb10..7f169c1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,6 @@ void help() { " -c FILE, --config FILE - Specify config file to use\n" " --display NAME - Specify the Wayland display to connect to\n" " --grace SECONDS - Set grace period in seconds before requiring authentication\n" - " --immediate - Lock immediately, ignoring any configured grace period\n" " --immediate-render - Do not wait for resources before drawing the background\n" " --no-fade-in - Disable the fade-in animation when the lock screen appears\n" " -V, --version - Show version information\n" @@ -41,10 +40,9 @@ static void printVersion() { int main(int argc, char** argv, char** envp) { std::string configPath; std::string wlDisplay; - bool immediate = false; bool immediateRender = false; bool noFadeIn = false; - int graceSeconds = 0; + int graceSeconds = 0; std::vector args(argv, argv + argc); @@ -94,10 +92,7 @@ int main(int argc, char** argv, char** envp) { } else return 1; - } else if (arg == "--immediate") - immediate = true; - - else if (arg == "--immediate-render") + } else if (arg == "--immediate-render") immediateRender = true; else if (arg == "--no-fade-in") @@ -124,11 +119,11 @@ int main(int argc, char** argv, char** envp) { return 1; } - if (noFadeIn || immediate) + if (noFadeIn) g_pConfigManager->m_AnimationTree.setConfigForNode("fadeIn", false, 0.f, "default"); try { - g_pHyprlock = makeUnique(wlDisplay, immediate, immediateRender, graceSeconds); + g_pHyprlock = makeUnique(wlDisplay, immediateRender, graceSeconds); g_pHyprlock->run(); } catch (const std::exception& ex) { Debug::log(CRIT, "Hyprlock threw: {}", ex.what());