Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / builtin / mainmenu / pkgmgr.lua

diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index 072c41f0cd17ad27a6744a0d06cd5c42343e51f7..c482cac9993fda5cecb0579b8ce9455ad9731362 100644 (file)
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -646,6 +646,8 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
                else
                        targetpath = core.get_gamepath() .. DIR_DELIM .. basename
                end
+       else
+               error("basefolder didn't return a recognised type, this shouldn't happen")
        end
 
        -- Copy it
@@ -739,7 +741,7 @@ function pkgmgr.preparemodlist(data)
                retval[#retval + 1] = {
                        type = "game",
                        is_game_content = true,
-                       name = fgettext("$1 mods", gamespec.name),
+                       name = fgettext("$1 mods", gamespec.title),
                        path = gamespec.path
                }
        end
@@ -924,10 +926,10 @@ end
 function pkgmgr.gamelist()
        local retval = ""
        if #pkgmgr.games > 0 then
-               retval = retval .. core.formspec_escape(pkgmgr.games[1].name)
+               retval = retval .. core.formspec_escape(pkgmgr.games[1].title)
 
                for i=2,#pkgmgr.games,1 do
-                       retval = retval .. "," .. core.formspec_escape(pkgmgr.games[i].name)
+                       retval = retval .. "," .. core.formspec_escape(pkgmgr.games[i].title)
                end
        end
        return retval