Multiplayer menu: fix attempt to open nonexistant image

Since local servers and local favorites have no ping value (these
are only provided by the server) we shouldn't load a broken
image filename.

Fixes #5238

diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 17d910e8b7f426243306be61f64e2f8beeab66be..57950c62c5f25f49d0da6956558753a52a59c067 100644 (file)
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -54,7 +54,8 @@ end
 function image_column(tooltip, flagname)
        return "image,tooltip=" .. core.formspec_escape(tooltip) .. "," ..
                "0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
-               "1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png") .. "," ..
+               "1=" .. core.formspec_escape(defaulttexturedir ..
+                       (flagname and "server_flags_" .. flagname .. ".png" or "blank.png")) .. "," ..
                "2=" .. core.formspec_escape(defaulttexturedir .. "server_ping_4.png") .. "," ..
                "3=" .. core.formspec_escape(defaulttexturedir .. "server_ping_3.png") .. "," ..
                "4=" .. core.formspec_escape(defaulttexturedir .. "server_ping_2.png") .. "," ..

diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua
index 033ba38d8d5e0ba91e18c3bee2c0f03a80777eba..0f4921b03b533ba15e83330d1343f318d6a21326 100644 (file)
--- a/builtin/mainmenu/tab_multiplayer.lua
+++ b/builtin/mainmenu/tab_multiplayer.lua
@@ -69,7 +69,7 @@ local function get_formspec(tabview, name, tabdata)
        --favourites
        retval = retval .. "tablecolumns[" ..
                image_column(fgettext("Favorite"), "favorite") .. ";" ..
-               image_column(fgettext("Ping"), "") .. ",padding=0.25;" ..
+               image_column(fgettext("Ping")) .. ",padding=0.25;" ..
                "color,span=3;" ..
                "text,align=right;" ..                -- clients
                "text,align=center,padding=0.25;" ..  -- "/"