mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-13 20:04:01 +02:00
Code Issues Projects Releases Wiki Activity

Make ui.beginInput return nil if cancelled

Browse Source
This commit is contained in:
Tamás Bálint Misius
2023-09-07 20:56:46 +02:00
parent 77071c524e
commit 59b79e805f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lua/LuaScriptInterface.cpp
View File

@@ -730,13 +730,20 @@ static int beginInput(lua_State* l)
auto *luacon_ci = static_cast<LuaScriptInterface *>(commandInterface);
auto cb = std::make_shared<LuaSmartRef>(luacon_ci->l); // * Bind to main lua state (might be different from l).
cb->Assign(l, 5);
auto handle = [cb](const String &input) {
auto handle = [cb](std::optional<String> input) {
auto *luacon_ci = static_cast<LuaScriptInterface *>(commandInterface);
auto l = luacon_ci->l;
cb->Push(l);
if (lua_isfunction(l, -1))
{
tpt_lua_pushString(l, input);
if (input)
{
tpt_lua_pushString(l, *input);
}
else
{
lua_pushnil(l);
}
if (lua_pcall(l, 1, 0, 0))
{
luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
@@ -750,7 +757,7 @@ static int beginInput(lua_State* l)
new TextPrompt(title, prompt, text, shadow, false, { [handle](const String &input) {
handle(input);
}, [handle]() {
handle({}); // * Has always returned empty string >_>
handle(std::nullopt);
} });
return 0;
}