From 6e83e96d1cff5c000fe30f22e052ec4815749c60 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 25 Sep 2018 12:05:47 -0700
Subject: [PATCH] Check type in Pointer::getPickResultCopy

---
 interface/src/raypick/LaserPointer.cpp    | 4 ++--
 interface/src/raypick/ParabolaPointer.cpp | 6 +++---
 interface/src/raypick/StylusPointer.cpp   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/raypick/LaserPointer.cpp b/interface/src/raypick/LaserPointer.cpp
index 79bca0449f..577978cc88 100644
--- a/interface/src/raypick/LaserPointer.cpp
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -36,10 +36,10 @@ void LaserPointer::editRenderStatePath(const std::string& state, const QVariant&
 }
 
 PickResultPointer LaserPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
-    if (!pickResult) {
+    auto rayPickResult = std::dynamic_pointer_cast<RayPickResult>(pickResult);
+    if (!rayPickResult) {
         std::make_shared<RayPickResult>();
     }
-    auto rayPickResult = std::static_pointer_cast<RayPickResult>(pickResult);
     return std::make_shared<RayPickResult>(*rayPickResult.get());
 }
 
diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp
index ec4222d5f6..92b82fff7f 100644
--- a/interface/src/raypick/ParabolaPointer.cpp
+++ b/interface/src/raypick/ParabolaPointer.cpp
@@ -31,11 +31,11 @@ ParabolaPointer::ParabolaPointer(const QVariant& rayProps, const RenderStateMap&
 }
 
 PickResultPointer ParabolaPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
-    if (!pickResult) {
+    auto parabolaPickResult = std::dynamic_pointer_cast<ParabolaPickResult>(pickResult);
+    if (!parabolaPickResult) {
         std::make_shared<ParabolaPickResult>();
     }
-    auto stylusPickResult = std::static_pointer_cast<ParabolaPickResult>(pickResult);
-    return std::make_shared<ParabolaPickResult>(*stylusPickResult.get());
+    return std::make_shared<ParabolaPickResult>(*parabolaPickResult.get());
 }
 
 void ParabolaPointer::editRenderStatePath(const std::string& state, const QVariant& pathProps) {
diff --git a/interface/src/raypick/StylusPointer.cpp b/interface/src/raypick/StylusPointer.cpp
index 2742c68d1d..0b44b2705d 100644
--- a/interface/src/raypick/StylusPointer.cpp
+++ b/interface/src/raypick/StylusPointer.cpp
@@ -148,10 +148,10 @@ bool StylusPointer::shouldTrigger(const PickResultPointer& pickResult) {
 }
 
 PickResultPointer StylusPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
-    if (!pickResult) {
+    auto stylusPickResult = std::dynamic_pointer_cast<StylusPickResult>(pickResult);
+    if (!stylusPickResult) {
         std::make_shared<StylusPickResult>();
     }
-    auto stylusPickResult = std::static_pointer_cast<StylusPickResult>(pickResult);
     return std::make_shared<StylusPickResult>(*stylusPickResult.get());
 }