From: Elijah Duffy <enduffy2014@outlook.com>
Date: Tue, 4 Jul 2017 07:27:29 +0000 (-0700)
Subject: Main Menu: Allow copying directories from non-Minetest locations (#6095)
X-Git-Tag: 5.0.0~1037
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=66c4108581902a34e2e42a4551c8c1157a881681;p=oweals%2Fminetest.git

Main Menu: Allow copying directories from non-Minetest locations (#6095)

Allow `core.copy_dir` (main menu API) to copy directories from a
non-Minetest location. The check to disallow copying to non-Minetest
locations is retained.
---

diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 7c86525f6..917fea134 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -813,8 +813,7 @@ int ModApiMainMenu::l_copy_dir(lua_State *L)
 	std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
 	std::string absolute_source = fs::RemoveRelativePathComponents(source);
 
-	if ((ModApiMainMenu::isMinetestPath(absolute_source)) &&
-			(ModApiMainMenu::isMinetestPath(absolute_destination))) {
+	if ((ModApiMainMenu::isMinetestPath(absolute_destination))) {
 		bool retval = fs::CopyDir(absolute_source,absolute_destination);
 
 		if (retval && (!keep_source)) {