aboutsummaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
authorBernardo Sulzbach <mafagafogigante@gmail.com>2016-12-12 00:39:09 -0200
committerparamat <mat.gregory@virginmedia.com>2016-12-12 07:22:47 +0000
commitd9675d3d922a2c8f521102c9386d14c694fda365 (patch)
tree350ebed0cb6601e3305b0743a4f7ff789bac6464 /builtin/mainmenu
parentc98ae2a91f2a9eb8dad011e71a04fd8ee2c2d767 (diff)
downloadminetest-d9675d3d922a2c8f521102c9386d14c694fda365.tar.gz
minetest-d9675d3d922a2c8f521102c9386d14c694fda365.tar.bz2
minetest-d9675d3d922a2c8f521102c9386d14c694fda365.zip
Mod dependency lists: Should have platform-independent line breaking
This fixes a bug existing in modmgr.lua as reported by @Wuzzy2 which caused the mod dependency list to glitch if input was using a line terminator different than the OS default. The C++ code does not need any changes as it already trims CR occurrences on platforms on which the line termination sequence is LF. Taken into account the size of the depends.txt files used, this should not introduce a noticeable performance regression. Fixes #4720
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/modmgr.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
index bf87b1dfa..2b7b371bf 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -296,6 +296,7 @@ function modmgr.get_dependencies(modfolder)
if dependencyfile then
local dependency = dependencyfile:read("*l")
while dependency do
+ dependency = dependency:gsub("\r", "")
if string.sub(dependency, -1, -1) == "?" then
table.insert(soft_dependencies, string.sub(dependency, 1, -2))
else