Fixed 5252: (Using cancelEvent(true) in event onResourceStart not removed event handler after implementation.)

ccw808 · ccw808 · commit fb75e0990ac1 · 2010-03-23T10:29:11.000Z
diff --git a/MTA10_Server/mods/deathmatch/logic/CResource.cpp b/MTA10_Server/mods/deathmatch/logic/CResource.cpp
@@ -784,12 +784,12 @@ bool CResource::Start ( list<CResource *> * dependents, bool bStartedManually, b
         if ( !m_pResourceElement->CallEvent ( "onResourceStart", Arguments ) )
         {
 			// We're no longer active. stop the resource
-            m_bActive = false;
             char szBuffer[255] = {0};
             CLogger::LogPrintf ( "Start up of resource %s cancelled by script\n", m_strResourceName.c_str () );
             _snprintf ( szBuffer, 254, "Start up of resource cancelled by script\n" );
             m_strFailureReason = szBuffer;
-            Stop ();
+            Stop ( true );
+            m_bActive = false;
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -784,12 +784,12 @@ bool CResource::Start ( list<CResource > dependents, bool bStartedManually, b`
`784`	`784`	`if ( !m_pResourceElement->CallEvent ( "onResourceStart", Arguments ) )`
`785`	`785`	`{`
`786`	`786`	`// We're no longer active. stop the resource`
`787`		`- m_bActive = false;`
`788`	`787`	`char szBuffer[255] = {0};`
`789`	`788`	`CLogger::LogPrintf ( "Start up of resource %s cancelled by script\n", m_strResourceName.c_str () );`
`790`	`789`	`_snprintf ( szBuffer, 254, "Start up of resource cancelled by script\n" );`
`791`	`790`	`m_strFailureReason = szBuffer;`
`792`		`- Stop ();`
	`791`	`+ Stop ( true );`
	`792`	`+ m_bActive = false;`
`793`	`793`	`return false;`
`794`	`794`	`}`
`795`	`795`