mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-04 08:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Fix checking for missing fields on tables in Dialog methods

Browse Source 
We've to use LUA_TNIL instead of LUA_TNONE.
This commit is contained in:
David Capello 2020-04-04 19:40:52 -03:00
parent c73d745245
commit 150ca293ef
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/script/dialog_class.cpp
View File

@ -288,7 +288,7 @@ int Dialog_add_widget(lua_State* L, Widget* widget)
// Focus magnet
type = lua_getfield(L, 2, "focus");
if (type != LUA_TNONE && lua_toboolean(L, -1))
if (type != LUA_TNIL && lua_toboolean(L, -1))
widget->setFocusMagnet(true);
lua_pop(L, 1);
}
@ -386,7 +386,7 @@ int Dialog_button_base(lua_State* L, T** outputWidget = nullptr)
if (lua_istable(L, 2)) {
int type = lua_getfield(L, 2, "selected");
if (type != LUA_TNONE)
if (type != LUA_TNIL)
widget->setSelected(lua_toboolean(L, -1));
lua_pop(L, 1);
@ -473,8 +473,7 @@ int Dialog_number(lua_State* L)
lua_pop(L, 1);
type = lua_getfield(L, 2, "decimals");
if (type != LUA_TNONE &&
type != LUA_TNIL) {
if (type != LUA_TNIL) {
widget->setDecimals(lua_tointegerx(L, -1, nullptr));
}
lua_pop(L, 1);
@ -491,19 +490,19 @@ int Dialog_slider(lua_State* L)
if (lua_istable(L, 2)) {
int type = lua_getfield(L, 2, "min");
if (type != LUA_TNONE) {
if (type != LUA_TNIL) {
min = lua_tointegerx(L, -1, nullptr);
}
lua_pop(L, 1);
type = lua_getfield(L, 2, "max");
if (type != LUA_TNONE) {
if (type != LUA_TNIL) {
max = lua_tointegerx(L, -1, nullptr);
}
lua_pop(L, 1);
type = lua_getfield(L, 2, "value");
if (type != LUA_TNONE) {
if (type != LUA_TNIL) {
value = lua_tointegerx(L, -1, nullptr);
}
lua_pop(L, 1);