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

fix a rare assert condition (window maps in iconic state but is not allowed to be iconic)

Browse source
This commit is contained in:
Dana Jansens 2008-01-27 20:26:29 -05:00
parent d783705141
commit 3b48aa4ea2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
openbox/client.c
View file

@ -309,9 +309,6 @@ void client_manage(Window window)
/* the session should get the last say though */ /* the session should get the last say though */
client_restore_session_state(self); client_restore_session_state(self);
/* now we have all of the window's information so we can set this up */
client_setup_decor_and_functions(self, FALSE);
/* tell startup notification that this app started */ /* tell startup notification that this app started */
launch_time = sn_app_started(self->startup_id, self->class, self->name); launch_time = sn_app_started(self->startup_id, self->class, self->name);
@ -319,12 +316,18 @@ void client_manage(Window window)
WM_STATE to apply. */ WM_STATE to apply. */
client_change_state(self); client_change_state(self);
/* add ourselves to the focus order */ /* add ourselves to the focus order. do this before
setup_decor_and_functions. if the window is mapping in a state that is
not allowed, then it will be adjusted, and that can change its position
in the focus order (deiconify for example) */
focus_order_add_new(self); focus_order_add_new(self);
/* do this to add ourselves to the stacking list in a non-intrusive way */ /* do this to add ourselves to the stacking list in a non-intrusive way */
client_calc_layer(self); client_calc_layer(self);
/* now we have all of the window's information so we can set this up */
client_setup_decor_and_functions(self, FALSE);
/* focus the new window? */ /* focus the new window? */
if (ob_state() != OB_STATE_STARTING && if (ob_state() != OB_STATE_STARTING &&
(!self->session || self->session->focused) && (!self->session || self->session->focused) &&