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.
Mikael Magnusson mikachu@gmail.com
1 files changed,
5 insertions(+),
4 deletions(-)
jump to
M
openbox/frame.c
→
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 @@ (now.tv_sec == self->flash_end.tv_sec &&
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) {