From 28e85ea2b27100de4d737347b3460324d7e971e2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Mon, 3 Nov 2014 12:52:11 +0100 Subject: [PATCH] Move final frame adjust in flashing to timeout func This possibly avoids badness when the timeout destroy notify is removed from the frame release func. --- openbox/frame.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openbox/frame.c b/openbox/frame.c index 68332df..8966972 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -1664,9 +1664,6 @@ static void flash_done(gpointer data) { ObFrame *self = data; - if (self->focused != self->flash_on) - frame_adjust_focus(self, self->focused); - self->flash_timer = 0; } @@ -1681,8 +1678,12 @@ static gboolean flash_timeout(gpointer data) now.tv_usec >= self->flash_end.tv_usec)) self->flashing = FALSE; - if (!self->flashing) + if (!self->flashing) { + if (self->focused != self->flash_on) + frame_adjust_focus(self, self->focused); + return FALSE; /* we are done */ + } self->flash_on = !self->flash_on; if (!self->focused) { -- 1.9.1