GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2025-01-24 20:58:06 +03:00
Code Issues Projects Releases Wiki Activity

Fix for bug 19453 (karlos)

Browse Source
This commit is contained in:
David Anderson 2005-09-26 22:11:44 +00:00
parent f7dbc25461
commit 116536fe36
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
amxmodx/amxmodx.cpp
View File

@ -32,6 +32,7 @@
#include <time.h> #include <time.h>
#include "amxmodx.h" #include "amxmodx.h"
#include "natives.h" #include "natives.h"
#include "debugger.h"
static cell AMX_NATIVE_CALL get_xvar_id(AMX *amx, cell *params) static cell AMX_NATIVE_CALL get_xvar_id(AMX *amx, cell *params)
{ {
@ -3092,6 +3093,10 @@ static cell AMX_NATIVE_CALL callfunc_end(AMX *amx, cell *params)
// call the func // call the func
cell retVal; cell retVal;
int err; int err;
Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
if (pDebugger)
pDebugger->BeginExec();
// copy the globs so the called func can also use callfunc // copy the globs so the called func can also use callfunc
cell gparams[CALLFUNC_MAXPARAMS]; cell gparams[CALLFUNC_MAXPARAMS];
@ -3117,11 +3122,21 @@ static cell AMX_NATIVE_CALL callfunc_end(AMX *amx, cell *params)
amx_Push(pAmx, gparams[i]); amx_Push(pAmx, gparams[i]);
} }
if ((err = amx_Exec(pAmx, &retVal, func) != AMX_ERR_NONE)) err = amx_Exec(pAmx, &retVal, func);
if (err != AMX_ERR_NONE)
{ {
return 0; if (pDebugger && pDebugger->ErrorExists())
{
//already handled
} else {
LogError(amx, err, NULL);
}
} }
if (pDebugger)
pDebugger->EndExec();
// process byref params (not byref_reused) // process byref params (not byref_reused)
for (int i = 0; i < curParam; ++i) for (int i = 0; i < curParam; ++i)
{ {