aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2020-06-22 14:40:04 +0100
committerGitHub <noreply@github.com>2020-06-22 14:40:04 +0100
commit4cb18d4874126b384ad5faa1b10a208c8fdce4db (patch)
tree87d63f83706f7e0fca617a0d0b10ea7446d26125
parente99415e0c5ae4a89907424d0f5f9f48ab94efbfa (diff)
downloadminetest-4cb18d4874126b384ad5faa1b10a208c8fdce4db.tar.gz
minetest-4cb18d4874126b384ad5faa1b10a208c8fdce4db.tar.bz2
minetest-4cb18d4874126b384ad5faa1b10a208c8fdce4db.zip
Fix HTTP API not being available in async mainmenu (#10086)
-rw-r--r--src/script/lua_api/l_http.cpp7
-rw-r--r--src/script/lua_api/l_http.h1
-rw-r--r--src/script/scripting_mainmenu.cpp1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp
index 73b4586e0..ec43bf174 100644
--- a/src/script/lua_api/l_http.cpp
+++ b/src/script/lua_api/l_http.cpp
@@ -230,3 +230,10 @@ void ModApiHttp::Initialize(lua_State *L, int top)
#endif
}
+
+void ModApiHttp::InitializeAsync(lua_State *L, int top)
+{
+#if USE_CURL
+ API_FCT(get_http_api);
+#endif
+}
diff --git a/src/script/lua_api/l_http.h b/src/script/lua_api/l_http.h
index c665235a9..de6e51b37 100644
--- a/src/script/lua_api/l_http.h
+++ b/src/script/lua_api/l_http.h
@@ -50,4 +50,5 @@ private:
public:
static void Initialize(lua_State *L, int top);
+ static void InitializeAsync(lua_State *L, int top);
};
diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 08858b1a5..0f672f917 100644
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -73,6 +73,7 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
asyncEngine.registerStateInitializer(registerLuaClasses);
asyncEngine.registerStateInitializer(ModApiMainMenu::InitializeAsync);
asyncEngine.registerStateInitializer(ModApiUtil::InitializeAsync);
+ asyncEngine.registerStateInitializer(ModApiHttp::InitializeAsync);
// Initialize async environment
//TODO possibly make number of async threads configurable