Unity

Merge lp://qastaging/~thumper/unity/hacking into lp://qastaging/unity

  1. hacking
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Merged at revision: 1635
Proposed branch: lp://qastaging/~thumper/unity/hacking
Merge into: lp://qastaging/unity
Diff against target: 22 lines (+2/-3)
1 file modified
plugins/unityshell/src/unityshell.cpp (+2/-3)
To merge this branch: bzr merge lp://qastaging/~thumper/unity/hacking
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+77260@code.qastaging.launchpad.net

Description of the change

CCSM was deleting and recreating the UnityScreen.

In the past, I had commented out the delete wt (windows thread) in the UnityScreen destructor because it was crashing on exit. This was causing CCSM to initiate a crash in unity as nux doesn't like having multiple threads.

I've fixed the nux dependencies in https://code.launchpad.net/~thumper/nux/view-deletion-after-window-thread/+merge/77256.

Also noticed that the switcher controller wasn't being deleted.

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) :
review: Approve

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.