Skip to content

csm-manager.c: Close the end-session dialog before trying to lock the screen during suspend/hibernate. #199

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

Merged
mtwebster merged 1 commit into from
Feb 11, 2026
+4 −4
Merged

csm-manager.c: Close the end-session dialog before trying to lock the screen during suspend/hibernate. #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cinnamon-session/csm-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
* want to wait, at least for something happening more than once.
* We can get deployed on very slow media though like CDROM devices,
* often with complex stacking/compressing filesystems on top, which
* is not a recipie for speed. Particularly now that we throw up

Check failure on line 70 in cinnamon-session/csm-manager.c

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22 

recipie ==> recipe
* a fail whale if required components don't show up quickly enough,
* let's make this fairly long.
*/
Expand Down Expand Up @@ -1232,12 +1232,12 @@
static void
manager_attempt_hibernate (CsmManager *manager)
{
close_end_session_dialog (manager);

/* lock the screen before we try anything. If it all fails, at least the screen is locked
* (if preferences dictate it) */
manager_perhaps_lock (manager);

close_end_session_dialog (manager);

if (csm_system_can_hibernate (manager->priv->system)) {
csm_system_hibernate (manager->priv->system);
}
Expand All @@ -1246,12 +1246,12 @@
static void
manager_attempt_suspend (CsmManager *manager)
{
close_end_session_dialog (manager);

/* lock the screen before we try anything. If it all fails, at least the screen is locked
* (if preferences dictate it) */
manager_perhaps_lock (manager);

close_end_session_dialog (manager);

if (g_settings_get_boolean (manager->priv->settings, KEY_PREFER_HYBRID_SLEEP) &&
csm_system_can_hybrid_sleep (manager->priv->system)) {
csm_system_hybrid_sleep (manager->priv->system);
Expand Down
Loading