mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-13 11:54:04 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash when trying to convert StringType to PointType

Browse Source
This commit is contained in:
jacksonmj
2013-09-27 19:41:12 +01:00
parent 44b7c4f8f4
commit ceca61114a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cat/TPTSTypes.cpp
View File

@@ -48,6 +48,13 @@ AnyType::operator StringType()
{ {
return StringType(*((std::string*)value)); return StringType(*((std::string*)value));
} }
else if (type == TypePoint && value)
{
ui::Point thisPoint = *((ui::Point*)value);
std::stringstream pointStream;
pointStream << thisPoint.X << "," << thisPoint.Y;
return StringType(pointStream.str());
}
else else
throw InvalidConversionException(type, TypeString); throw InvalidConversionException(type, TypeString);
@@ -61,10 +68,13 @@ AnyType::operator PointType()
} }
else if(type == TypeString) else if(type == TypeString)
{ {
ui::Point thisPoint = *((ui::Point*)value); std::stringstream pointStream(*((std::string*)value));
std::stringstream pointStream; int x, y;
pointStream << thisPoint.X << "," << thisPoint.Y; char comma;
return StringType(pointStream.str()); pointStream >> x >> comma >> y;
if (pointStream.fail() || comma != ',')
throw InvalidConversionException(type, TypePoint);
return PointType(ui::Point(x, y));
} }
else else
throw InvalidConversionException(type, TypePoint); throw InvalidConversionException(type, TypePoint);