summaryrefslogtreecommitdiffstats
path: root/kwin/kompmgr/kompmgr.c
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-09 18:43:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-09 18:43:10 +0000
commitf69216c64458e28e3bce3e2b294803336f4eeff5 (patch)
tree38fa509bd40dff46fe8bf2c75c56af09110709e3 /kwin/kompmgr/kompmgr.c
parentf5f0024b74d1bb0eb94937f3dc175d2b682617c2 (diff)
downloadtdebase-f69216c64458e28e3bce3e2b294803336f4eeff5.tar.gz
tdebase-f69216c64458e28e3bce3e2b294803336f4eeff5.zip
Fix kompmgr crash on window resize
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1252372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/kompmgr/kompmgr.c')
-rw-r--r--kwin/kompmgr/kompmgr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c
index 6044c8300..64ddce408 100644
--- a/kwin/kompmgr/kompmgr.c
+++ b/kwin/kompmgr/kompmgr.c
@@ -1092,7 +1092,7 @@ paint_root (Display *dpy)
static XserverRegion
win_extents (Display *dpy, win *w)
{
- XRectangle r;
+ XRectangle r;
r.x = w->a.x;
r.y = w->a.y;
@@ -1761,6 +1761,7 @@ map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
determine_mode (dpy, w);
w->windowType = determine_wintype (dpy, w->id, w->id);
+ if ((w->windowType < 0) || (w->windowType > NUM_WINTYPES)) w->windowType = WINTYPE_NORMAL;
#if 0
printf("window 0x%x type %s\n", w->id, wintype_name(w->windowType));
#endif
@@ -2267,6 +2268,9 @@ add_win (Display *dpy, Window id, Window prev)
new->decoHash = 0;
new->show_root_tile = determine_window_transparent_to_desktop(dpy, id);
+ new->windowType = determine_wintype (dpy, new->id, new->id);
+ if ((new->windowType < 0) || (new->windowType > NUM_WINTYPES)) new->windowType = WINTYPE_NORMAL;
+
new->borderClip = None;
new->prev_trans = 0;