Fixed crash in getPedSimplestTask

ccw808 · ccw808 · commit 1f65b4643c85 · 2016-01-02T13:08:56.000Z
diff --git a/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -1757,15 +1757,18 @@ const char* CStaticFunctionDefinitions::GetPedSimplestTask ( CClientPed& Ped )
                     break;
             }
         }
-        CTask* pTempTask = pTask->GetSubTask ();
-        while ( pTempTask )
-        {
-            pTask = pTempTask;
-            pTempTask = pTempTask->GetSubTask ();
-        }
         if ( pTask )
         {
-            return pTask->GetTaskName ();
+            CTask* pTempTask = pTask->GetSubTask ();
+            while ( pTempTask )
+            {
+                pTask = pTempTask;
+                pTempTask = pTempTask->GetSubTask ();
+            }
+            if ( pTask )
+            {
+                return pTask->GetTaskName ();
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1757,15 +1757,18 @@ const char* CStaticFunctionDefinitions::GetPedSimplestTask ( CClientPed& Ped )`
`1757`	`1757`	`break;`
`1758`	`1758`	`}`
`1759`	`1759`	`}`
`1760`		`- CTask* pTempTask = pTask->GetSubTask ();`
`1761`		`- while ( pTempTask )`
`1762`		`- {`
`1763`		`- pTask = pTempTask;`
`1764`		`- pTempTask = pTempTask->GetSubTask ();`
`1765`		`- }`
`1766`	`1760`	`if ( pTask )`
`1767`	`1761`	`{`
`1768`		`- return pTask->GetTaskName ();`
	`1762`	`+ CTask* pTempTask = pTask->GetSubTask ();`
	`1763`	`+ while ( pTempTask )`
	`1764`	`+ {`
	`1765`	`+ pTask = pTempTask;`
	`1766`	`+ pTempTask = pTempTask->GetSubTask ();`
	`1767`	`+ }`
	`1768`	`+ if ( pTask )`
	`1769`	`+ {`
	`1770`	`+ return pTask->GetTaskName ();`
	`1771`	`+ }`
`1769`	`1772`	`}`
`1770`	`1773`	`}`
`1771`	`1774`