matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix uncaught exception in console when trying to parse invalid numbers

Browse Source
This commit is contained in:
jacob1 2019-02-16 19:20:55 -05:00
parent 25c1b13bd4
commit 46cd49ba24
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/game/SampleTool.cpp
View File

@ -54,7 +54,7 @@ void SampleTool::Draw(Simulation * sim, Brush * brush, ui::Point position)
for(std::vector<Tool*>::iterator iter = elementTools.begin(), end = elementTools.end(); iter != end; ++iter)
{
Tool * elementTool = *iter;
if(elementTool && (elementTool->GetToolID() >> PMAPBITS) == particleCtype)
if(elementTool && ID(elementTool->GetToolID()) == particleCtype)
gameModel->SetActiveTool(0, elementTool);
}
}

9
src/lua/TPTScriptInterface.cpp
View File

@ -150,7 +150,14 @@ int TPTScriptInterface::parseNumber(String str)
}
else
{
return str.ToNumber<int>();
try
{
return str.ToNumber<int>();
}
catch (std::exception & e)
{
throw GeneralException(ByteString(e.what()).FromUtf8());
}
}
return currentNumber;
}