Fix uncaught exception in console when trying to parse invalid numbers

The-Powder-Toy · Feb 17, 2019 · 46cd49b · 46cd49b
1 parent 25c1b13
commit 46cd49b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/gui/game/SampleTool.cpp b/src/gui/game/SampleTool.cpp
@@ -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);
 				}
 			}

diff --git a/src/lua/TPTScriptInterface.cpp b/src/lua/TPTScriptInterface.cpp
@@ -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;
 }