ardour/livetrax
13
0
Fork 0
Code

fix out-of-order d'tor which garbles the lua stack.

Browse Source
This commit is contained in:
Robin Gareus 2016-03-24 22:53:59 +01:00
parent e0dedcf6e1
commit 7bb1933734
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk2_ardour/luainstance.cc
View File

@ -1319,18 +1319,43 @@ LuaCallback::connect_2 (enum LuaSignal::LuaSignal ls, T ref, PBD::Signal2<void,
template <typename T> void template <typename T> void
LuaCallback::proxy_0 (enum LuaSignal::LuaSignal ls, T ref) { LuaCallback::proxy_0 (enum LuaSignal::LuaSignal ls, T ref) {
luabridge::LuaRef rv ((*_lua_call)((int)ls, ref)); bool ok = true;
if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */} {
const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref));
if (! rv.cast<bool> ()) {
ok = false;
}
}
/* destroy LuaRef ^^ first before calling drop_callback() */
if (!ok) {
drop_callback (); /* EMIT SIGNAL */
}
} }
template <typename T, typename C1> void template <typename T, typename C1> void
LuaCallback::proxy_1 (enum LuaSignal::LuaSignal ls, T ref, C1 a1) { LuaCallback::proxy_1 (enum LuaSignal::LuaSignal ls, T ref, C1 a1) {
luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1)); bool ok = true;
if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */} {
const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref, a1));
if (! rv.cast<bool> ()) {
ok = false;
}
}
if (!ok) {
drop_callback (); /* EMIT SIGNAL */
}
} }
template <typename T, typename C1, typename C2> void template <typename T, typename C1, typename C2> void
LuaCallback::proxy_2 (enum LuaSignal::LuaSignal ls, T ref, C1 a1, C2 a2) { LuaCallback::proxy_2 (enum LuaSignal::LuaSignal ls, T ref, C1 a1, C2 a2) {
luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1, a2)); bool ok = true;
if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */} {
const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref, a1, a2));
if (! rv.cast<bool> ()) {
ok = false;
}
}
if (!ok) {
drop_callback (); /* EMIT SIGNAL */
}
} }