Merge lp:~azzar1/unity/fix-crash-close-button-1605010 into lp:unity

[Andrea Azzarone]

Properly destroy close_button_ to properly disconnect lambda.

Test case added to make sure the close_button is properly destroyed.

[Marco Trevisan (Treviño) (3v1n0)]

I did the same :-)

review: Approve

=== modified file 'tests/test_unity_window_view.cpp'
--- tests/test_unity_window_view.cpp	2016-03-31 02:03:55 +0000
+++ tests/test_unity_window_view.cpp	2016-07-21 10:50:16 +0000
@@ -82,12 +82,18 @@
   view.closable = true;
   ASSERT_NE(view.close_button_, nullptr);
 
+  auto weak_ptr = nux::ObjectWeakPtr<IconTexture>(view.close_button_);
+  ASSERT_TRUE(weak_ptr.IsValid());
+
   EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON));
   EXPECT_EQ(view.close_button_->GetParentObject(), &view);
 
   int padding = view.style()->GetCloseButtonPadding().CP(view.scale);
   EXPECT_EQ(view.close_button_->GetBaseX(), padding);
   EXPECT_EQ(view.close_button_->GetBaseY(), padding);
+
+  view.closable = false;
+  ASSERT_FALSE(weak_ptr.IsValid());
 }
 
 TEST_F(TestUnityWindowView, CloseButtonStates)
 
=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2016-07-01 17:58:24 +0000
+++ unity-shared/UnityWindowView.cpp	2016-07-21 10:50:16 +0000
@@ -145,6 +145,7 @@
 {
   if (!closable)
   {
+    close_button_->UnParentObject();
     close_button_ = nullptr;
     return;
   }