Ping: Fixed timing issue with FinishAction

Plugins/PluginPing/Ping.cpp

@@ -162,6 +162,8 @@ PLUGIN_EXPORT double Update(void* data)
 {
 	MeasureData* measure = (MeasureData*)data;
 
+	double value = 0.0;
+
 	EnterCriticalSection(&g_CriticalSection);
 	if (!measure->threadActive)
 	{
@@ -184,7 +186,7 @@ PLUGIN_EXPORT double Update(void* data)
 		}
 	}
 
-	double value = measure->value;
+	value = measure->value;
 	LeaveCriticalSection(&g_CriticalSection);
 
 	return value;
@@ -221,6 +223,8 @@ DWORD WINAPI NetworkThreadProc(void* pParam)
 	MeasureData* measure = (MeasureData*)pParam;
 	double value = measure->timeoutValue;
 
+	bool doFinishAction = false;
+
 	if (measure->destAddrInfo)
 	{
 		bool useIPv6 = false;
@@ -293,10 +297,7 @@ DWORD WINAPI NetworkThreadProc(void* pParam)
 				}
 				IcmpCloseHandle(hIcmpFile);
 
-				if (!measure->finishAction.empty())
-				{
-					RmExecute(measure->skin, measure->finishAction.c_str());
-				}
+				doFinishAction = true;
 			}
 
 			delete [] buffer;
@@ -330,6 +331,11 @@ DWORD WINAPI NetworkThreadProc(void* pParam)
 		// the last instance.
 		FreeLibraryAndExitThread(module, 0UL);
 	}
+	else if (doFinishAction && !measure->finishAction.empty())
+	{
+		// Perform the FinishAction
+		RmExecute(measure->skin, measure->finishAction.c_str());
+	}
 
 	return 0;
 }