From aa110a00e0d70f6fb072e4cd7ef7a4063c4158e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 7 Dec 2005 18:04:43 +0000
Subject: [PATCH] AttachedToWindow() could be called twice in case new views
 were added during AttachedToWindow(). This fixes the double team entries in
 the Deskbar.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15398 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/interface/View.h |  2 +-
 src/kits/interface/View.cpp | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/headers/os/interface/View.h b/headers/os/interface/View.h
index 2c59079d1d..1efc17e6b1 100644
--- a/headers/os/interface/View.h
+++ b/headers/os/interface/View.h
@@ -591,7 +591,7 @@ private:
 			BScrollBar*		fVerScroller;
 			BScrollBar*		fHorScroller;
 			bool			f_is_printing;
-			bool			_unused_bool0;
+			bool			fAttached;
 			bool			_unused_bool1;
 			bool			_unused_bool2;
 			BPrivate::ViewState*	fState;
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 98d73f0cec..917ad331cd 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -3274,14 +3274,11 @@ BView::AddChild(BView *child, BView *before)
 	}
 
 	if (!_AddChildToList(child, before))
-		debugger("AddChild failed - cannot find 'before' view.");	
+		debugger("AddChild failed!");	
 
 	if (fOwner) {
 		check_lock();
 
- 		STRACE(("BView(%s)::AddChild(child='%s' before='%s')... contacting app_server\n",
- 			Name(), child ? child->Name() : "NULL", before ? before->Name() : "NULL"));
-
 		child->_SetOwner(fOwner);
 		child->_CreateSelf();
 		child->_Attach();
@@ -3766,6 +3763,7 @@ BView::_InitData(BRect frame, const char *name, uint32 resizingMode, uint32 flag
 	fHorScroller = NULL;
 
 	f_is_printing = false;
+	fAttached = false;
 
 	fState = new BPrivate::ViewState;
 
@@ -4079,9 +4077,13 @@ void
 BView::_Attach()
 {
 	AttachedToWindow();
+	fAttached = true;
 
 	for (BView* child = fFirstChild; child != NULL; child = child->fNextSibling) {
-		child->_Attach();
+		// we need to check for fAttachCalled as new views could have been
+		// added in AttachedToWindow() - and those are already attached
+		if (!child->fAttached)
+			child->_Attach();
 	}
 
 	AllAttached();
@@ -4092,6 +4094,7 @@ void
 BView::_Detach()
 {
 	DetachedFromWindow();
+	fAttached = false;
 
 	for (BView* child = fFirstChild; child != NULL; child = child->fNextSibling) {
 		child->_Detach();