also check .Enabled in PROP

This commit is contained in:
jacob1
2013-05-11 22:42:58 -04:00
parent 135bf44347
commit a5ae843553

View File

@@ -139,7 +139,7 @@ void PropertyWindow::SetProperty()
buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit); buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit);
buffer >> tempInt; buffer >> tempInt;
} }
if (property->GetOption().first == "type" && (tempInt < 0 || tempInt >= PT_NUM)) if (property->GetOption().first == "type" && (tempInt < 0 || tempInt >= PT_NUM || !sim->elements[tempInt].Enabled))
{ {
new ErrorMessage("Could not set property", "Invalid Particle Type"); new ErrorMessage("Could not set property", "Invalid Particle Type");
return; return;