Skip to content

xmlLoadFile print error #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 29, 2017
Merged

xmlLoadFile print error #174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
705739b
Merge pull request #1 from multitheftauto/master
CrosRoad95 Nov 20, 2017
4251045
error argument in `xmlLoadFile` function
CrosRoad95 Nov 25, 2017
332843a
now print in debug insted of return argument
CrosRoad95 Nov 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM )

// Grab our resource
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
SString strError = "";
if ( pLuaMain )
{
SString strFileInput;
Expand Down Expand Up @@ -184,6 +185,8 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM )
}
}

xmlFile->GetLastError ( strError );
argStream.SetCustomError(strError, SString("Unable to read XML file %s", strFileInput.c_str()));
// Destroy it if we failed
pLuaMain->DestroyXML ( xmlFile );
}
Expand Down