From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 22 Feb 2019 03:19:52 +0000 (+0000)
Subject: Content store: Ignore '_game' in game names in ID generation (#8270)
X-Git-Tag: 5.0.0~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85389ad9949fa3ffca85aa65e577a70547bcd211;p=oweals%2Fminetest.git

Content store: Ignore '_game' in game names in ID generation (#8270)

Fixes 'install' button continuing to be displayed after installing a game whose
name ends with '_game'.
---

diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index a9a9363dc..384bee36c 100644
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -297,7 +297,12 @@ function store.load()
 				package.author .. "/" .. package.name ..
 				"/releases/" .. package.release .. "/download/"
 
-			package.id = package.author .. "/" .. package.name
+			local name_len = #package.name
+			if package.type == "game" and name_len > 5 and package.name:sub(name_len - 4) == "_game" then
+				package.id = package.author .. "/" .. package.name:sub(1, name_len - 5)
+			else
+				package.id = package.author .. "/" .. package.name
+			end
 		end
 
 		store.packages = store.packages_full