nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move final frame adjust in flashing to timeout func

Browse source 
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
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
openbox/frame.c
View file

@ -1664,9 +1664,6 @@ static void flash_done(gpointer data)
{ {
ObFrame *self = data; ObFrame *self = data;
if (self->focused != self->flash_on)
frame_adjust_focus(self, self->focused);
self->flash_timer = 0; self->flash_timer = 0;
} }
@ -1681,8 +1678,12 @@ static gboolean flash_timeout(gpointer data)
now.tv_usec >= self->flash_end.tv_usec)) now.tv_usec >= self->flash_end.tv_usec))
self->flashing = FALSE; 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 */ return FALSE; /* we are done */
}
self->flash_on = !self->flash_on; self->flash_on = !self->flash_on;
if (!self->focused) { if (!self->focused) {