Unity

Merge lp:~bregma/unity/fix-standalone-shorts-startup-crash into lp:unity

  1. fix-standalone-shorts-startup-crash
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 2966
Proposed branch: lp:~bregma/unity/fix-standalone-shorts-startup-crash
Merge into: lp:unity
Diff against target: 19 lines (+2/-0)
1 file modified
shortcuts/StandaloneShortcuts.cpp (+2/-0)
To merge this branch: bzr merge lp:~bregma/unity/fix-standalone-shorts-startup-crash
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Nick Dedekind (community) Approve
Review via email: mp+139010@code.launchpad.net

Commit message

Fixed a segfault in the standalone shortcuts tool caused by uninitialized global variables.

Description of the change

Fixes a segfault in the standalone shortcuts tool caused by uninitialized secret hidden global variables.

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

LGTM.
Works for me.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/216/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/216/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/216/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Re-approving. Autolanding failed due to a API change with compiz that was not yet reflected in unity. The API change has been resolved.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp 2012-10-18 11:45:32 +0000
+++ shortcuts/StandaloneShortcuts.cpp 2012-12-10 15:43:25 +0000
@@ -27,6 +27,7 @@
27#include "BaseWindowRaiserImp.h"27#include "BaseWindowRaiserImp.h"
28#include "MockShortcutHint.h"28#include "MockShortcutHint.h"
29#include "ShortcutController.h"29#include "ShortcutController.h"
30#include "unity-shared/UnitySettings.h"
3031
31using namespace unity;32using namespace unity;
3233
@@ -241,6 +242,7 @@
241 gtk_init(&argc, &argv);242 gtk_init(&argc, &argv);
242243
243 nux::NuxInitialize(0);244 nux::NuxInitialize(0);
245 unity::Settings settings;
244246
245 BackgroundEffectHelper::blur_type = BLUR_NONE;247 BackgroundEffectHelper::blur_type = BLUR_NONE;
246 nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Shortcut Hint Overlay"), 1200, 720, 0, &ThreadWidgetInit, 0);248 nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Shortcut Hint Overlay"), 1200, 720, 0, &ThreadWidgetInit, 0);