Skip to content

Commit b34c4d1

Browse files
committed
backup-locker.c: Kill xprop during unlock.
In the old screensaver, xprop monitored the screensaver window. When the screensaver was unlocked, that window would be destroyed, and xprop would exit on its own. Now, it monitors Cinnamon's stage window, which never gets destroyed, so we need to explicitly kill xprop when unlocking to prevent it getting orphaned when the backup-locker exits.
1 parent 930b71f commit b34c4d1

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/screensaver/backup-locker/backup-locker.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,14 +716,17 @@ window_monitor_thread (GTask *task,
716716
}
717717
else
718718
{
719-
g_debug ("xprop cancelled");
719+
g_debug ("xprop cancelled, killing subprocess");
720+
g_subprocess_send_signal (xprop_proc, SIGTERM);
720721
}
721722
}
722723
else
723724
{
724725
gint exit_status = g_subprocess_get_exit_status (xprop_proc);
725726
g_debug ("xprop exited (status=%d)", exit_status);
726727
}
728+
729+
g_object_unref (xprop_proc);
727730
}
728731
g_clear_error (&error);
729732
g_task_return_boolean (task, TRUE);

0 commit comments

Comments
 (0)