Unity

Merge lp:~azzar1/unity/fix-851982 into lp:unity

  1. fix-851982
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2460
Proposed branch: lp:~azzar1/unity/fix-851982
Merge into: lp:unity
Diff against target: 10 lines (+1/-0)
1 file modified
plugins/unityshell/src/compizminimizedwindowhandler.h (+1/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-851982
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
jenkins (community) continuous-integration Approve
Review via email: mp+112440@code.launchpad.net

Commit message

Fix a crash in compizminimizedwindowhandler.

Description of the change

== Problem ==
compiz crashed with SIGSEGV in CompWindow::id() from getPaintMask( [compizminimizedwindowhandler.h] from unity::UnityWindow::glPaint()

== Fix ==
Remove the window from the static list minimizingWindows in the dtor.

== Test ==
Not applicable.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:2450
http://s-jenkins:8080/job/unity-ci/34/

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
2--- plugins/unityshell/src/compizminimizedwindowhandler.h 2012-05-31 09:28:02 +0000
3+++ plugins/unityshell/src/compizminimizedwindowhandler.h 2012-06-27 21:24:20 +0000
4@@ -104,6 +104,7 @@
5 template <typename Screen, typename Window>
6 compiz::CompizMinimizedWindowHandler<Screen, Window>::~CompizMinimizedWindowHandler ()
7 {
8+ minimizingWindows.remove (priv->mWindow);
9 minimizedWindows.remove (this);
10 }
11