BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Strip carriage returns from lines in settingtypes.txt (#11338)

Browse Source 
Co-authored-by: SmallJoker <SmallJoker@users.noreply.github.com>
This commit is contained in:
William L. DeRieux IV 2021-06-21 13:55:48 -04:00 committed by GitHub
parent 4b9a51ff0d
commit 9d2e7fc983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu/dlg_settings_advanced.lua
View File

@ -31,6 +31,10 @@ end
-- returns error message, or nil -- returns error message, or nil
local function parse_setting_line(settings, line, read_all, base_level, allow_secure) local function parse_setting_line(settings, line, read_all, base_level, allow_secure)
-- strip carriage returns (CR, /r)
line = line:gsub("\r", "")
-- comment -- comment
local comment = line:match("^#" .. CHAR_CLASSES.SPACE .. "*(.*)$") local comment = line:match("^#" .. CHAR_CLASSES.SPACE .. "*(.*)$")
if comment then if comment then