lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix modpack rename dialog selecting the wrong mod

master
number Zero 2018-06-11 01:40:00 +03:00 committed by rubenwardy
parent 339341ba4e
commit 7c239767ff
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/mainmenu/dlg_rename_modpack.lua
View File

@ -18,9 +18,6 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local function rename_modpack_formspec(dialogdata) local function rename_modpack_formspec(dialogdata)
dialogdata.mod = pkgmgr.global_mods:get_list()[dialogdata.selected]
local retval = local retval =
"size[11.5,4.5,true]" .. "size[11.5,4.5,true]" ..
"field[2.5,2;7,0.5;te_modpack_name;".. fgettext("Rename Modpack:") .. ";" .. "field[2.5,2;7,0.5;te_modpack_name;".. fgettext("Rename Modpack:") .. ";" ..
@ -38,7 +35,7 @@ local function rename_modpack_buttonhandler(this, fields)
if fields["dlg_rename_modpack_confirm"] ~= nil then if fields["dlg_rename_modpack_confirm"] ~= nil then
local oldpath = core.get_modpath() .. DIR_DELIM .. this.data.mod.name local oldpath = core.get_modpath() .. DIR_DELIM .. this.data.mod.name
local targetpath = core.get_modpath() .. DIR_DELIM .. fields["te_modpack_name"] local targetpath = core.get_modpath() .. DIR_DELIM .. fields["te_modpack_name"]
core.copy_dir(oldpath,targetpath,false) os.rename(oldpath, targetpath)
pkgmgr.refresh_globals() pkgmgr.refresh_globals()
pkgmgr.selected_mod = pkgmgr.global_mods:get_current_index( pkgmgr.selected_mod = pkgmgr.global_mods:get_current_index(
pkgmgr.global_mods:raw_index_by_uid(fields["te_modpack_name"])) pkgmgr.global_mods:raw_index_by_uid(fields["te_modpack_name"]))
@ -56,12 +53,12 @@ local function rename_modpack_buttonhandler(this, fields)
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function create_rename_modpack_dlg(selected_index) function create_rename_modpack_dlg(modpack)
local retval = dialog_create("dlg_delete_mod", local retval = dialog_create("dlg_delete_mod",
rename_modpack_formspec, rename_modpack_formspec,
rename_modpack_buttonhandler, rename_modpack_buttonhandler,
nil) nil)
retval.data.selected = selected_index retval.data.mod = modpack
return retval return retval
end end

4
builtin/mainmenu/tab_content.lua
View File

@ -164,10 +164,12 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
end end
if fields["btn_mod_mgr_rename_modpack"] ~= nil then if fields["btn_mod_mgr_rename_modpack"] ~= nil then
local dlg_renamemp = create_rename_modpack_dlg(tabdata.selected_pkg) local mod = packages:get_list()[tabdata.selected_pkg]
local dlg_renamemp = create_rename_modpack_dlg(mod)
dlg_renamemp:set_parent(tabview) dlg_renamemp:set_parent(tabview)
tabview:hide() tabview:hide()
dlg_renamemp:show() dlg_renamemp:show()
packages = nil
return true return true
end end