Compiz

Merge lp://staging/~hikiko/compiz/0.9.11-fix-1245886 into lp://staging/compiz/0.9.11

  1. 0.9.11-fix-1245886
  2. Merge into 0.9.11
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3799
Merged at revision: 3798
Proposed branch: lp://staging/~hikiko/compiz/0.9.11-fix-1245886
Merge into: lp://staging/compiz/0.9.11
Diff against target: 14 lines (+4/-0)
1 file modified
plugins/decor/src/decor.cpp (+4/-0)
To merge this branch: bzr merge lp://staging/~hikiko/compiz/0.9.11-fix-1245886
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Review via email: mp+193063@code.staging.launchpad.net

Commit message

It fixes the bug #1245886. In DecorScreen::handleEvent compiz shouldn't try to handle any events if there's no active window yet.

Description of the change

It fixes the bug #1245886. In DecorScreen::handleEvent compiz shouldn't try to handle any events if there's no active window yet.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3798
http://jenkins.qa.ubuntu.com/job/compiz-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/112

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-ci/299/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3798
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-0.9.11-ci/1/rebuild

review: Approve (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

+1.

Are the changes (additional brackets) in src/window.cpp really needed ?

So adding

if (!activeWindow)
    return;

to decor.cpp, DecorScreen::handleEvent () would be enough imho...

The commit message could be nicer also ;)

review: Approve
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

I got a warning for the branches when I performed static analysis, that's why I added them but they don't really fix anything, so, I can remove them. Sorry for the short commit message :)

Revision history for this message
Eleni Maria Stea (hikiko) wrote :

sorry, :s/branches/brackets :)

Revision history for this message
MC Return (mc-return) wrote :

I cannot test this properly at the moment, hope someone else will do that soonish...

Thanks for improving the commit message.

lp://staging/~hikiko/compiz/0.9.11-fix-1245886 updated
3799. By Eleni Maria Stea

removed not really necessary brackets to have a cleaner diff

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/113

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-ci/300/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3799
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/compiz-0.9.11-ci/2/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Good.

review: Approve
Revision history for this message
Christopher Townsend (townsend) wrote :

This change is unfortunately causing a bad side effect that all windows are "hung" when restarting Compiz and rendering the desktop unusable. I'm not sure how to properly fix this, so in the mean time, I'm going to propose another branch that reverts this change.

Revision history for this message
Eleni Maria Stea (hikiko) wrote :

I didn't see any issue but maybe I was just too lucky! I will test it a few more times! If you only get the crash after my change we should definately revert the branch! :s Sorry!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches