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 on 2012-12-10
Status: Merged
Approved by: Brandon Schaefer on 2012-12-10
Approved revision: 2964
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 continuous-integration Needs Fixing on 2012-12-10
Nick Dedekind (community) 2012-12-10 Approve on 2012-12-10
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.
Nick Dedekind (nick-dedekind) wrote :

LGTM.
Works for me.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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
1=== modified file 'shortcuts/StandaloneShortcuts.cpp'
2--- shortcuts/StandaloneShortcuts.cpp 2012-10-18 11:45:32 +0000
3+++ shortcuts/StandaloneShortcuts.cpp 2012-12-10 15:43:25 +0000
4@@ -27,6 +27,7 @@
5 #include "BaseWindowRaiserImp.h"
6 #include "MockShortcutHint.h"
7 #include "ShortcutController.h"
8+#include "unity-shared/UnitySettings.h"
9
10 using namespace unity;
11
12@@ -241,6 +242,7 @@
13 gtk_init(&argc, &argv);
14
15 nux::NuxInitialize(0);
16+ unity::Settings settings;
17
18 BackgroundEffectHelper::blur_type = BLUR_NONE;
19 nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Shortcut Hint Overlay"), 1200, 720, 0, &ThreadWidgetInit, 0);