From 09004680d08e5a48733ce65dc4c16cfe77d1664d Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 7 Apr 2016 13:32:26 -0700
Subject: [PATCH] handle a couple edge cases

---
 interface/src/Application.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9f43afc476..2e27560e58 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2171,12 +2171,23 @@ void Application::keyPressEvent(QKeyEvent* event) {
                             case CAMERA_MODE_ENTITY:
                                 _returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode;
                                 break;
+
+                            default:
+                                _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
+                                break;
                         }
                     }
 
                     bool isMirrorChecked = Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror);
                     Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, !isMirrorChecked);
                     if (isMirrorChecked) {
+
+                        // if we got here without coming in from a non-Full Screen mirror case, then our
+                        // _returnFromFullScreenMirrorTo is unknown. In that case we'll go to the old 
+                        // behavior of returning to ThirdPerson
+                        if (_returnFromFullScreenMirrorTo.isEmpty()) {
+                            _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
+                        }
                         Menu::getInstance()->setIsOptionChecked(_returnFromFullScreenMirrorTo, true);
                     }
                     cameraMenuChanged();