1.1 --- a/core/smn_timers.cpp	Sat Feb 23 12:25:27 2008 +0000
     1.2 +++ b/core/smn_timers.cpp	Sat Feb 23 20:18:49 2008 +0000
     1.3 @@ -33,6 +33,7 @@
     1.4  #include "TimerSys.h"
     1.5  #include "PluginSys.h"
     1.6  #include "Logger.h"
     1.7 +#include "DebugReporter.h"
     1.8  
     1.9  #define TIMER_HNDL_CLOSE	(1<<9)
    1.10  
    1.11 @@ -150,19 +151,23 @@
    1.12  	{
    1.13  		if ((herr=g_HandleSys.FreeHandle(usrhndl, &sec)) != HandleError_None)
    1.14  		{
    1.15 -			g_Logger.LogError("Invalid data handle %x (error %d) passed during timer end on plugin %s", 
    1.16 -								usrhndl, 
    1.17 -								herr, 
    1.18 -								g_PluginSys.FindPluginByContext(pInfo->pContext->GetContext())->GetFilename());
    1.19 +			g_DbgReporter.GenerateError(pInfo->pContext,
    1.20 +										pInfo->Hook->GetFunctionID(), 
    1.21 +										SP_ERROR_NATIVE, 
    1.22 +										"Invalid data handle %x (error %d) passed during timer end",
    1.23 +										usrhndl, 
    1.24 +										herr);
    1.25  		}
    1.26  	}
    1.27  
    1.28  	if ((herr=g_HandleSys.FreeHandle(pInfo->TimerHandle, &sec)) != HandleError_None)
    1.29  	{
    1.30 -		g_Logger.LogError("Invalid timer handle %x (error %d) on plugin %s during timer end", 
    1.31 -							pInfo->TimerHandle, 
    1.32 -							herr, 
    1.33 -							g_PluginSys.FindPluginByContext(pInfo->pContext->GetContext())->GetFilename());
    1.34 +		g_DbgReporter.GenerateError(pInfo->pContext, 
    1.35 +									pInfo->Hook->GetFunctionID(), 
    1.36 +									SP_ERROR_NATIVE, 
    1.37 +									"Invalid timer handle %x (error %d) during timer end, displayed function is timer callback, not the stack trace", 
    1.38 +									pInfo->TimerHandle, 
    1.39 +									herr);
    1.40  		return;
    1.41  	}
    1.42  	DeleteTimerInfo(pInfo);
    1.43 @@ -332,4 +337,3 @@
    1.44  	{"IsServerProcessing",		smn_IsServerProcessing},
    1.45  	{NULL,						NULL}
    1.46  };
    1.47 -