From 82a61634bf5f0f7e61bc3ecfdb165cb17dab64b1 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 9 Dec 2016 10:15:24 +0100
Subject: [PATCH] Don't detect UI scaling on first run if
 FSEnableAutomaticUIScaling is FALSE

---
 indra/newview/llviewerwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 776a12d17b..f9f3cb2d0d 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1865,7 +1865,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
 #if !LL_WINDOWS
 	gSavedSettings.setBOOL("FSEnableAutomaticUIScaling", FALSE); // Always disable on non-Windows systems for now
 #endif
-	if (p.first_run || (gSavedSettings.getBOOL("FSEnableAutomaticUIScaling") && gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor))
+	if (gSavedSettings.getBOOL("FSEnableAutomaticUIScaling") && (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor))
 	// </FS:Ansariel>
 	{
 		mSystemUIScaleFactorChanged = !p.first_run;