X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=88c74b68d048baf3519a753303b547be07e4b7c0;hb=HEAD;hp=1aa79d2a122e8a57f2b0859bf4815ca912da66bf;hpb=177a0340a7eea0955a5b0795bdd4bd55779acf5c;p=chaz%2Fopenbox diff --git a/openbox/prompt.c b/openbox/prompt.c index 1aa79d2a..88c74b68 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -75,11 +75,12 @@ void prompt_startup(gboolean reconfig) void prompt_shutdown(gboolean reconfig) { - GList *it; + GList *it, *next; if (!reconfig) { - for (it = prompt_list; it; it = g_list_next(it)) { + for (it = prompt_list; it; it = next) { ObPrompt *p = it->data; + next = it->next; if (p->cleanup) p->cleanup(p, p->data); } @@ -594,7 +595,7 @@ static void prompt_run_callback(ObPrompt *self, gint result) { prompt_ref(self); if (self->func) { - gboolean clean = self->func(self, self->focus->result, self->data); + gboolean clean = self->func(self, result, self->data); if (clean && self->cleanup) self->cleanup(self, self->data); }