diff --git a/pipeline-layout.ps1 b/pipeline-layout.ps1 index 4a6415d..ef159f4 100644 --- a/pipeline-layout.ps1 +++ b/pipeline-layout.ps1 @@ -205,6 +205,19 @@ function Remove-MoonWellRuntimeGarbage { } } + # GlueXML is shipped by patch-ruRU-4.MPQ. Historical development copies in + # the client root override that archive and can restore the password form. + foreach ($relativePath in @( + 'Interface\GlueXML\AccountLogin.lua', + 'Interface\GlueXML\AccountLogin.xml' + )) { + $legacyOverride = Join-Path $Destination $relativePath + if (Test-Path -LiteralPath $legacyOverride -PathType Leaf) { + Remove-Item -LiteralPath $legacyOverride -Force + Write-Host "Removed obsolete loose GlueXML override: $legacyOverride" + } + } + Remove-EmptyMoonWellDirectories -Destination $Destination } diff --git a/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.lua b/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.lua index 72d0c98..bca5725 100644 --- a/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.lua +++ b/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.lua @@ -112,6 +112,14 @@ end local function ApplyLaunchMode() local developerMode = LoginState.launchMode == "developer" + local launcherMode = LoginState.launchMode == "launcher" + + if launcherMode then + AccountLoginUI:Hide() + else + AccountLoginUI:Show() + AccountLoginUI:SetAlpha(1) + end if developerMode then UICache.accountEdit:Show() @@ -417,6 +425,10 @@ function AccountLogin_OnLoad(self) end function AccountLogin_OnShow(self) + LoginState.luaBridgePending = type(MoonWellGetLaunchMode) ~= "function" + LoginState.launchMode = ResolveLaunchMode() + ApplyLaunchMode() + -- Submit launcher credentials before constructing the decorative login UI. -- A cosmetic Lua error must never be able to block authentication. TryLauncherFallbackLogin() @@ -450,9 +462,6 @@ function AccountLogin_OnShow(self) elseif self.animatedTexture then self.animatedTexture:Hide() end - AccountLoginUI:Show() - AccountLoginUI:SetAlpha(1) - if not self.newLogo then self.newLogoFrame = CreateFrame("Frame", nil, self) self.newLogoFrame:SetWidth(Config.LOGO_SIZE) @@ -486,8 +495,6 @@ function AccountLogin_OnShow(self) self.modelUpdateCount = 0 self.modelUpdateTimer = 0 - LoginState.luaBridgePending = type(MoonWellGetLaunchMode) ~= "function" - LoginState.launchMode = ResolveLaunchMode() local accountName, password = "", "" if LoginState.launchMode == "developer" then accountName, password = unpack(string_explode(GetSavedAccountName(), "#&|&#")) diff --git a/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.xml b/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.xml index 70e3675..dc60c9b 100644 --- a/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.xml +++ b/src/Data/ruRU/patch-ruRU-4/Interface/GlueXML/AccountLogin.xml @@ -207,7 +207,7 @@ - + - +