diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-02-09 08:56:37 +1300 |
|---|---|---|
| committer | Tim Penhey <tim.penhey@canonical.com> | 2012-02-09 08:56:37 +1300 |
| commit | c40e01f5962e6402e329a03741664c8edc6bfe33 (patch) | |
| tree | ad7be20885ee6a5e0ea529236993aa1e70985366 | |
| parent | 99bc108e07040a8e2c114e8bdd00b1d1c69e7658 (diff) | |
We don't want to adopt, just assign as the layout is not initially owned.
(bzr r1926.1.5)
| -rw-r--r-- | plugins/unityshell/src/FilterExpanderLabel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/unityshell/src/FilterExpanderLabel.cpp b/plugins/unityshell/src/FilterExpanderLabel.cpp index 35543bd7c..be4da93e6 100644 --- a/plugins/unityshell/src/FilterExpanderLabel.cpp +++ b/plugins/unityshell/src/FilterExpanderLabel.cpp @@ -76,7 +76,8 @@ void FilterExpanderLabel::SetRightHandView(nux::View* view) void FilterExpanderLabel::SetContents(nux::Layout* contents) { - contents_.Adopt(contents); + // Since the contents is initially unowned, we don't want to Adopt it, just assign. + contents_ = contents; layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL); top_bar_layout_->SetTopAndBottomPadding(0); |