Unity

Merge lp:~vanvugt/unity/fix-901602-trunk into lp:unity

  1. fix-901602-trunk
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alex Launi
Approved revision: no longer in the source branch.
Merged at revision: 1787
Proposed branch: lp:~vanvugt/unity/fix-901602-trunk
Merge into: lp:unity
Diff against target: 21 lines (+3/-1)
1 file modified
plugins/unityshell/src/PanelView.cpp (+3/-1)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-901602-trunk
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+84920@code.launchpad.net

Description of the change

Fix uninitialized variable read (LP: #901602)

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/63/console reported an error when processing this lp:~vanvugt/unity/fix-901602-trunk branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp 2011-12-08 05:51:01 +0000
+++ plugins/unityshell/src/PanelView.cpp 2011-12-08 10:41:28 +0000
@@ -54,6 +54,8 @@
5454
55PanelView::PanelView(NUX_FILE_LINE_DECL)55PanelView::PanelView(NUX_FILE_LINE_DECL)
56 : View(NUX_FILE_LINE_PARAM),56 : View(NUX_FILE_LINE_PARAM),
57 _last_width(0),
58 _last_height(0),
57 _is_dirty(true),59 _is_dirty(true),
58 _opacity(1.0f),60 _opacity(1.0f),
59 _opacity_maximized_toggle(false),61 _opacity_maximized_toggle(false),
@@ -362,7 +364,7 @@
362{364{
363 nux::Geometry geo = GetGeometry();365 nux::Geometry geo = GetGeometry();
364366
365 if (geo.width == _last_width && geo.height == _last_height && !_is_dirty)367 if (!_is_dirty && geo.width == _last_width && geo.height == _last_height)
366 return;368 return;
367369
368 _last_width = geo.width;370 _last_width = geo.width;