From 3bd94918ed7f2926c695c7f14a552cbc08ad4d84 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 21 Sep 2009 04:29:27 +0000 Subject: [PATCH] Reordered Reference::SetTo() operation so that it is safe to reinitialize to the same referenceable. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33215 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/shared/Referenceable.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/headers/private/shared/Referenceable.h b/headers/private/shared/Referenceable.h index 9ed177bd70..27ddcd32a6 100644 --- a/headers/private/shared/Referenceable.h +++ b/headers/private/shared/Referenceable.h @@ -83,10 +83,12 @@ public: void SetTo(Type* object, bool alreadyHasReference = false) { + if (object != NULL && !alreadyHasReference) + object->AddReference(); + Unset(); + fObject = object; - if (fObject && !alreadyHasReference) - fObject->AddReference(); } void Unset()