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.
This commit is contained in:
Mikael Magnusson 2014-11-03 12:52:11 +01:00
parent 031e3c13b4
commit 28e85ea2b2

View file

@ -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) {