From bc91affa708b8cbddd95d5b95af9bc0bd8dd4d56 Mon Sep 17 00:00:00 2001
From: r3tk0n <r3tk0n@gmail.com>
Date: Fri, 20 Jul 2018 15:13:44 -0700
Subject: [PATCH] Bring this PR inline with RC70.1 PR.

---
 interface/src/Application.cpp     | 5 +++--
 interface/src/avatar/MyAvatar.cpp | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 216ec9ac42..ae212e933d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4841,9 +4841,10 @@ void Application::loadSettings() {
         isFirstPerson = (qApp->isHMDMode());
 
         // Flying should be disabled by default in HMD mode on first run, and it
-        // should be enabled by default in desktop mode, always.
+        // should be enabled by default in desktop mode.
+
         auto myAvatar = getMyAvatar();
-        myAvatar->setFlyingEnabled((isFirstPerson)?false:true);
+        myAvatar->setFlyingEnabled(!isFirstPerson);
 
     } else {
         // if this is not the first run, the camera will be initialized differently depending on user settings
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index fd121055a1..6a3ae91dd6 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1281,7 +1281,8 @@ void MyAvatar::loadData() {
         settings.remove("avatarEntityData");
     }
     setAvatarEntityDataChanged(true);
-    setFlyingEnabled(settings.value("enabledFlying").toBool());
+    Setting::Handle<bool> firstRunVal { Settings::firstRun, true };
+    setFlyingEnabled(firstRunVal.get() ? getFlyingEnabled() : settings.value("enabledFlying").toBool());
     setDisplayName(settings.value("displayName").toString());
     setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
     setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());