From d9b522d10cb55025e6f8927f72d31f94690b8e96 Mon Sep 17 00:00:00 2001 From: danteruiz Date: Wed, 27 Mar 2019 16:43:03 -0700 Subject: [PATCH] remove error file --- interface/src/avatar/.#AvatarManager.cpp | 1 - interface/src/avatar/AvatarManager.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 interface/src/avatar/.#AvatarManager.cpp diff --git a/interface/src/avatar/.#AvatarManager.cpp b/interface/src/avatar/.#AvatarManager.cpp deleted file mode 100644 index b55ef44c07..0000000000 --- a/interface/src/avatar/.#AvatarManager.cpp +++ /dev/null @@ -1 +0,0 @@ -Dante@DESKTOP-TUOA3HH.30568:1553633650 \ No newline at end of file diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index ea8cdc8105..33cd48a047 100755 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -542,7 +542,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar auto scene = qApp->getMain3DScene(); avatar->fadeOut(scene, removalReason); - AvatarData* avatarData = removedAvatar.get(); + std::weak_ptr avatarDataWeakPtr = removedAvatar; transaction.transitionFinishedOperator(avatar->getRenderItemID(), [avatarDataWeakPtr]() { auto avatarDataPtr = avatarDataWeakPtr.lock();