Player can now be killed and fixed crazy runtime delete error

JISyed · Apr 28, 2014 · 0312f56 · 0312f56
1 parent 6f57ea8
commit 0312f56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/HedronSpace/BulletLifetime.cpp b/HedronSpace/BulletLifetime.cpp
@@ -53,7 +53,10 @@ namespace sfew
 		// Runs at destruction of component
 		void BulletLifetime::Cleanup()
 		{
-			_lifeTimer._Get()->Destroy();
+			if(!_lifeTimer.expired())
+			{
+				_lifeTimer._Get()->Destroy();
+			}
 		}
 
 		// Run if there is a collision with an object of a different group

diff --git a/HedronSpace/ControlEnemy.cpp b/HedronSpace/ControlEnemy.cpp
@@ -91,7 +91,10 @@ namespace sfew
 			}
 
 			// Mark timer for deletion
-			_shootTimer._Get()->Destroy();
+			if(!_shootTimer.expired())
+			{
+				_shootTimer._Get()->Destroy();
+			}
 		}
 
 		// Run if there is a collision with an object of a different group