From 0cd3fd40ec7b13143424063a1d0d3cf249689e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 16 Feb 2006 21:27:02 +0000 Subject: [PATCH] Speaking about bugs... removing views is now actually working again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16441 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/View.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index 3df94d6650..a0d5bfa95c 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -3380,10 +3380,10 @@ BView::RemoveSelf() if (!fParent || !fParent->_RemoveChildFromList(this)) return false; - if (owner != NULL && fTopLevelView) { + if (owner != NULL && !fTopLevelView) { // the top level view is deleted by the app_server automatically owner->fLink->StartMessage(AS_LAYER_DELETE); - owner->fLink->Attach(_get_object_token_(fParent)); + owner->fLink->Attach(_get_object_token_(this)); } STRACE(("DONE: BView(%s)::RemoveSelf()\n", Name())); @@ -4148,7 +4148,7 @@ BView::_Detach() AllDetached(); if (fOwner) { - check_lock(); + check_lock_no_pick(); // make sure our owner doesn't need us anymore