From 76f33ff853175a6442cc92ab98ec3a31710fade8 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 14 Nov 2018 13:27:00 -0800
Subject: [PATCH] dont allow auto-switch after display mode change

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4951a5006e..30da4305e3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1298,6 +1298,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(this, &Application::activeDisplayPluginChanged, this, [&](){
         auto dialogsManager = DependencyManager::get<DialogsManager>();
         if (getLoginDialogPoppedUp()) {
+            if (_firstRun.get()) {
+                // display mode changed.  Don't allow auto-switch to work after this session.
+                _firstRun.set(false);
+            }
             if (_loginDialogOverlayID.isNull()) {
                 // HMD mode.
                 dialogsManager->hideLoginDialog();