mirror of
https://github.com/IgorTimofeev/MineOS.git
synced 2025-12-20 02:59:20 +01:00
Merge pull request #664 from happymimimix/master
Blank password fix (2nd time)
This commit is contained in:
commit
0f83657cc8
@ -352,7 +352,7 @@ end
|
|||||||
local function checkUserInputs()
|
local function checkUserInputs()
|
||||||
local nameEmpty = #usernameInput.text == 0
|
local nameEmpty = #usernameInput.text == 0
|
||||||
local nameVaild = usernameInput.text:match("^%w[%w%s_]+$")
|
local nameVaild = usernameInput.text:match("^%w[%w%s_]+$")
|
||||||
local passValid = withoutPasswordSwitchAndLabel.switch.state or #passwordInput.text == 0 or #passwordSubmitInput.text == 0 or passwordInput.text == passwordSubmitInput.text
|
local passValid = withoutPasswordSwitchAndLabel.switch.state or (#passwordInput.text > 0 and #passwordSubmitInput.text > 0 and passwordInput.text == passwordSubmitInput.text)
|
||||||
|
|
||||||
if (nameEmpty or nameVaild) and passValid then
|
if (nameEmpty or nameVaild) and passValid then
|
||||||
usernamePasswordText.hidden = true
|
usernamePasswordText.hidden = true
|
||||||
@ -418,7 +418,7 @@ end)
|
|||||||
-- Filesystem selection stage
|
-- Filesystem selection stage
|
||||||
addStage(function()
|
addStage(function()
|
||||||
prevButton.disabled = false
|
prevButton.disabled = false
|
||||||
nextButton.disabled = false
|
nextButton.disabled = true
|
||||||
|
|
||||||
layout:addChild(GUI.object(1, 1, 1, 1))
|
layout:addChild(GUI.object(1, 1, 1, 1))
|
||||||
addTitle(0x696969, localization.select)
|
addTitle(0x696969, localization.select)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user