summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2021-07-19 11:56:14 +0300
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2021-07-19 11:56:14 +0300
commit43669165559ead4da7e1021bc132e85856b78894 (patch)
tree4cf6650fedfd926f912f3105982d4c5a30c410db
parent962076161d3a9d2780529136b746331bef6475f0 (diff)
downloadmetacity-43669165559ead4da7e1021bc132e85856b78894.tar.gz
session: always finish interaction
After commits 0b3f45bb1bf8 and db37deb589ea SmcInteractDone and SmcSaveYourselfDone is only called if zenity dialog exits with 0 code. Finish interaction also when dialog is closed by pressing Cancel indicating that shutdown should be canceled. https://gitlab.gnome.org/GNOME/metacity/-/issues/20
-rw-r--r--src/core/session.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/session.c b/src/core/session.c
index 38b41d01..f7b137b2 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1774,6 +1774,11 @@ dialog_closed (GPid pid, int status, gpointer user_data)
{
finish_interact (shutdown);
}
+ else
+ {
+ SmcInteractDone (session_connection, shutdown ? True : False);
+ save_yourself_possibly_done (shutdown, FALSE);
+ }
}
static void