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

Update #1013 with a temporary fix. Changes to wxString in wx 2.9 caused the issue, because wxString::c_string() no longer returned a wchar_t* or char* and thus those weren't caught by the proper exception handler.

Browse source 
This fix should be replaced with a proper exception type later.

Originally committed to SVN as r3813.
This commit is contained in:
Niels Martin Hansen 2009-11-21 13:24:12 +00:00
parent 815ad4b8ca
commit 3e52c7a592
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/auto4_lua.cpp
View file

@ -229,7 +229,7 @@ namespace Automation4 {
if (lua_load(L, script_reader.reader_func, &script_reader, GetPrettyFilename().mb_str(wxConvUTF8))) { if (lua_load(L, script_reader.reader_func, &script_reader, GetPrettyFilename().mb_str(wxConvUTF8))) {
wxString *err = new wxString(lua_tostring(L, -1), wxConvUTF8); wxString *err = new wxString(lua_tostring(L, -1), wxConvUTF8);
err->Prepend(_T("Error loading Lua script \"") + GetPrettyFilename() + _T("\":\n\n")); err->Prepend(_T("Error loading Lua script \"") + GetPrettyFilename() + _T("\":\n\n"));
throw err->c_str(); throw err->wx_str();
} }
_stackcheck.check_stack(1); _stackcheck.check_stack(1);
// and execute it // and execute it
@ -239,7 +239,7 @@ namespace Automation4 {
// error occurred, assumed to be on top of Lua stack // error occurred, assumed to be on top of Lua stack
wxString *err = new wxString(lua_tostring(L, -1), wxConvUTF8); wxString *err = new wxString(lua_tostring(L, -1), wxConvUTF8);
err->Prepend(_T("Error initialising Lua script \"") + GetPrettyFilename() + _T("\":\n\n")); err->Prepend(_T("Error initialising Lua script \"") + GetPrettyFilename() + _T("\":\n\n"));
throw err->c_str(); throw err->wx_str();
} }
_stackcheck.check_stack(0); _stackcheck.check_stack(0);
lua_getglobal(L, "version"); lua_getglobal(L, "version");