Commit 285d6dda authored by Ray Strode's avatar Ray Strode

Fix intermittent failure to load user list

The greeter was failing to show the user list if ck-history took longer
than a second to load.

https://bugzilla.gnome.org/show_bug.cgi?id=626564
parent 2d9876d2
......@@ -1562,8 +1562,8 @@ ck_history_watch (GIOChannel *source,
if (manager->priv->ck_history_watchdog_id != 0) {
g_source_remove (manager->priv->ck_history_watchdog_id);
manager->priv->ck_history_watchdog_id = 0;
manager->priv->ck_history_pid = 0;
}
manager->priv->ck_history_pid = 0;
maybe_set_is_loaded (manager);
......@@ -1604,6 +1604,7 @@ ck_history_watchdog (GdmUserManager *manager)
if (manager->priv->ck_history_pid > 0) {
g_debug ("Killing ck-history process");
signal_pid (manager->priv->ck_history_pid, SIGTERM);
manager->priv->ck_history_pid = 0;
}
manager->priv->ck_history_watchdog_id = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment