From d4c1bb519945fd1019c19df8b6d26e76463fc10c Mon Sep 17 00:00:00 2001
From: Emma Broman <emmbr740@student.liu.se>
Date: Wed, 15 Jan 2020 11:47:08 -0500
Subject: [PATCH] Remove risk of access violation and add a comment

---
 modules/autonavigation/autonavigationhandler.cpp | 3 +--
 modules/autonavigation/autonavigationhandler.h   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/autonavigation/autonavigationhandler.cpp b/modules/autonavigation/autonavigationhandler.cpp
index 66a9328063..1ed7804b5e 100644
--- a/modules/autonavigation/autonavigationhandler.cpp
+++ b/modules/autonavigation/autonavigationhandler.cpp
@@ -191,8 +191,7 @@ void AutoNavigationHandler::continuePath() {
 
 bool AutoNavigationHandler::handleInstruction(const Instruction& instruction, int index)
 {
-    CameraState& currentLast = _pathSegments.back().end;
-    CameraState startState = _pathSegments.empty() ? currentCameraState() : currentLast;
+    CameraState startState = _pathSegments.empty() ? currentCameraState() : _pathSegments.back().end;
 
     CameraState endState;
     double duration, startTime;
diff --git a/modules/autonavigation/autonavigationhandler.h b/modules/autonavigation/autonavigationhandler.h
index 0cbbaa90b7..a089adb6bc 100644
--- a/modules/autonavigation/autonavigationhandler.h
+++ b/modules/autonavigation/autonavigationhandler.h
@@ -81,6 +81,7 @@ private:
     glm::dvec3 computeTargetPositionAtNode(const SceneGraphNode* node,
         glm::dvec3 prevPos, double height);
 
+    // This list essentially represents the camera path
     std::vector<PathSegment> _pathSegments;
 
     double _currentTime;