e: tiling: fix restoring old border

SVN revision: 71427
This commit is contained in:
Boris Faure 2012-05-25 13:40:56 +00:00
parent 35dda3c894
commit 404b5a9c84
1 changed files with 4 additions and 1 deletions

View File

@ -374,7 +374,6 @@ _restore_border(E_Border *bd)
bd->maximized = extra->orig.maximized; bd->maximized = extra->orig.maximized;
} }
change_window_border(bd, extra->orig.bordername); change_window_border(bd, extra->orig.bordername);
} }
@ -3270,6 +3269,8 @@ static void
_pre_border_assign_hook(void *data __UNUSED__, _pre_border_assign_hook(void *data __UNUSED__,
E_Border *bd) E_Border *bd)
{ {
Border_Extra *extra;
if (tiling_g.config->show_titles) if (tiling_g.config->show_titles)
return; return;
@ -3294,6 +3295,8 @@ _pre_border_assign_hook(void *data __UNUSED__,
return; return;
} }
extra = _get_or_create_border_extra(bd);
if ((bd->bordername && strcmp(bd->bordername, "pixel")) if ((bd->bordername && strcmp(bd->bordername, "pixel"))
|| !bd->bordername) || !bd->bordername)
{ {