← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/compiz/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/03_fix_configureframe.patch

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-10-04 08:29:38 UTC
  • Revision ID: package-import@ubuntu.com-20111004082938-sy427ni6to2x581u
Tags: 1:0.9.6+bzr20110929-0ubuntu2
https://launchpad.net/bugs/862719
https://launchpad.net/bugs/861909
* debian/patches/02_fix_autofocus_minimize_window.patch:
  - closing a window gives focus to last minimized window (LP: #862719)
* debian/patches/03_fix_configureframe.patch:
  - compiz crashed with SIGSEGV in PrivateWindow::configureFrame()
    (LP: #861909)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_fix_configureframe.patch
 
1
=== modified file 'src/window.cpp'
 
2
Index: compiz-0.9.6+bzr20110929/src/window.cpp
 
3
===================================================================
 
4
--- compiz-0.9.6+bzr20110929.orig/src/window.cpp        2011-10-03 22:33:24.135668659 +0800
 
5
+++ compiz-0.9.6+bzr20110929/src/window.cpp     2011-10-03 22:33:45.667775433 +0800
 
6
@@ -2004,8 +2004,16 @@
 
7
     if (priv->frameGeometry.border () != ce->border_width)
 
8
        valueMask |= CWBorderWidth;
 
9
 
 
10
-    if (ROOTPARENT (window->prev) != ce->above)
 
11
-       valueMask |= CWSibling | CWStackMode;
 
12
+    if (window->prev)
 
13
+    {
 
14
+       if (ROOTPARENT (window->prev) != ce->above)
 
15
+           valueMask |= CWSibling | CWStackMode;
 
16
+    }
 
17
+    else
 
18
+    {
 
19
+       if (ce->above != 0)
 
20
+           valueMask |= CWSibling | CWStackMode;
 
21
+    }
 
22
 
 
23
     for (std::list <XWCValueMask>::iterator it = pendingConfigures.begin ();
 
24
         it != pendingConfigures.end (); it++)