fix segfault

This commit is contained in:
Sascha Kruse 2013-03-10 23:55:20 +01:00
parent e3bce11796
commit 99feeea84b

11
x.c
View File

@ -465,7 +465,10 @@ static void setopacity(Window win, unsigned long opacity)
*/ */
gboolean x_mainloop_fd_prepare(GSource * source, gint * timeout) gboolean x_mainloop_fd_prepare(GSource * source, gint * timeout)
{ {
*timeout = -1; if (timeout)
*timeout = -1;
else
g_print("BUG: x_mainloop_fd_prepare: timeout == NULL\n");
return false; return false;
} }
@ -510,9 +513,9 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
0) == settings.close_ks.sym 0) == settings.close_ks.sym
&& settings.close_ks.mask == ev.xkey.state) { && settings.close_ks.mask == ev.xkey.state) {
if (displayed) { if (displayed) {
notification_close notification *n = g_queue_peek_head(displayed);
(g_queue_peek_head_link(displayed)-> if (n)
data, 2); notification_close(n, 2);
} }
} }
if (settings.history_ks.str if (settings.history_ks.str