Don't detect UI scaling on first run if FSEnableAutomaticUIScaling is FALSE

meow-7.2.2
Ansariel 2016-12-09 10:15:24 +01:00
parent 93e00d9138
commit 82a61634bf
1 changed files with 1 additions and 1 deletions

View File

@ -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;