mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Return nil from lua functions which require a project context if they're called during script initialization. Closes #1380.

Browse source 
Originally committed to SVN as r6255.
This commit is contained in:
Thomas Goyne 2012-01-09 20:31:19 +00:00
parent bf26c14999
commit 8bfefd356c
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aegisub/src/auto4_lua.cpp
View file

@ -125,7 +125,10 @@ namespace {
const agi::Context *get_context(lua_State *L) const agi::Context *get_context(lua_State *L)
{ {
lua_getfield(L, LUA_REGISTRYINDEX, "project_context"); lua_getfield(L, LUA_REGISTRYINDEX, "project_context");
assert(lua_islightuserdata(L, -1)); if (!lua_islightuserdata(L, -1)) {
lua_pop(L, 1);
return 0;
}
const agi::Context * c = static_cast<const agi::Context *>(lua_touserdata(L, -1)); const agi::Context * c = static_cast<const agi::Context *>(lua_touserdata(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
return c; return c;
@ -458,7 +461,7 @@ namespace Automation4 {
const agi::Context *c = get_context(L); const agi::Context *c = get_context(L);
int ms = lua_tointeger(L, -1); int ms = lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
if (c->videoController->TimecodesLoaded()) if (c && c->videoController->TimecodesLoaded())
lua_pushnumber(L, c->videoController->FrameAtTime(ms, agi::vfr::START)); lua_pushnumber(L, c->videoController->FrameAtTime(ms, agi::vfr::START));
else else
lua_pushnil(L); lua_pushnil(L);
@ -471,7 +474,7 @@ namespace Automation4 {
const agi::Context *c = get_context(L); const agi::Context *c = get_context(L);
int frame = lua_tointeger(L, -1); int frame = lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
if (c->videoController->TimecodesLoaded()) if (c && c->videoController->TimecodesLoaded())
lua_pushnumber(L, c->videoController->TimeAtFrame(frame, agi::vfr::START)); lua_pushnumber(L, c->videoController->TimeAtFrame(frame, agi::vfr::START));
else else
lua_pushnil(L); lua_pushnil(L);
@ -481,7 +484,7 @@ namespace Automation4 {
int LuaScript::LuaVideoSize(lua_State *L) int LuaScript::LuaVideoSize(lua_State *L)
{ {
const agi::Context *c = get_context(L); const agi::Context *c = get_context(L);
if (c->videoController->IsLoaded()) { if (c && c->videoController->IsLoaded()) {
lua_pushnumber(L, c->videoController->GetWidth()); lua_pushnumber(L, c->videoController->GetWidth());
lua_pushnumber(L, c->videoController->GetHeight()); lua_pushnumber(L, c->videoController->GetHeight());
lua_pushnumber(L, c->videoController->GetAspectRatioValue()); lua_pushnumber(L, c->videoController->GetAspectRatioValue());
@ -497,6 +500,11 @@ namespace Automation4 {
int LuaScript::LuaGetKeyframes(lua_State *L) int LuaScript::LuaGetKeyframes(lua_State *L)
{ {
const agi::Context *c = get_context(L); const agi::Context *c = get_context(L);
if (!c) {
lua_pushnil(L);
return 1;
}
std::vector<int> const& kf = c->videoController->GetKeyFrames(); std::vector<int> const& kf = c->videoController->GetKeyFrames();
lua_newtable(L); lua_newtable(L);