Unity

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

  1. hacking
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Merged at revision: 1635
Proposed branch: lp:~thumper/unity/hacking
Merge into: lp: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:~thumper/unity/hacking
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+77260@code.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
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2011-09-27 16:12:35 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2011-09-28 01:49:27 +0000
4@@ -315,6 +315,7 @@
5 switcher_desktop_icon->UnReference();
6 panelController->UnReference();
7 delete controller;
8+ delete switcherController;
9 launcherWindow->UnReference();
10
11 notify_uninit();
12@@ -334,9 +335,7 @@
13 ::unity::ui::IconRenderer::DestroyTextures();
14 QuicklistManager::Destroy();
15
16- // Deleting the windows thread calls XCloseDisplay, which calls XSync, which
17- // sits waiting for a reply.
18- // delete wt;
19+ delete wt;
20 }
21
22 void UnityScreen::initAltTabNextWindow()