cemu-project/archived-idapython
1
0
Fork 0
mirror of https://github.com/cemu-project/idapython.git synced 2026-01-31 01:15:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: Previous implementation set_script_timeout() was causing the script wait dialog box to open and never close upon the invocation of callbacks (add_menu_item callback or other callbacks) that take longer than the timeout value.

Browse Source
This commit is contained in:
elias.bachaalany
2011-05-09 10:29:08 +00:00
parent 7179b2c654
commit a52b90c771
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python.cpp
View File

@@ -128,8 +128,8 @@ static bool g_ui_ready = false;
static bool g_alert_auto_scripts = true;
static bool g_remove_cwd_sys_path = false;
void end_execution();
void begin_execution();
static void end_execution();
static void begin_execution();
//------------------------------------------------------------------------
// This callback is called on various interpreter events
@@ -159,29 +159,36 @@ static int break_check(PyObject *obj, _frame *frame, int what, PyObject *arg)
}
//------------------------------------------------------------------------
static void reset_execution_time()
{
start_time = time(NULL);
ninsns = 0;
}
// Prepare for Python execution
void begin_execution()
static void begin_execution()
{
if ( !g_ui_ready || script_timeout == 0 )
return;
ninsns = 0;
end_execution();
box_displayed = false;
start_time = time(NULL);
reset_execution_time();
PyEval_SetTrace(break_check, NULL);
}
//------------------------------------------------------------------------
// Called after Python execution finishes
void end_execution()
static void hide_script_waitbox()
{
if ( box_displayed )
{
hide_wait_box();
box_displayed = false;
}
}
static void end_execution()
{
hide_script_waitbox();
#ifdef ENABLE_PYTHON_PROFILING
PyEval_SetTrace(tracefunc, NULL);
#else
@@ -191,15 +198,18 @@ void end_execution()
//-------------------------------------------------------------------------
// Exported to the Python environment
void disable_script_timeout()
{
script_timeout = 0;
end_execution();
}
int set_script_timeout(int timeout)
{
if ( timeout == 0 )
end_execution();
qswap(timeout, script_timeout);
if ( script_timeout != 0 )
begin_execution();
reset_execution_time();
hide_script_waitbox();
return timeout;
}