Skip to content

Commit a1b28ce

Browse files
author
kalibera
committed
Revert 88372 (doesn't prevent recursive event loop via other paths).
git-svn-id: https://svn.r-project.org/R/trunk@88392 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 2013285 commit a1b28ce

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

src/gnuwin32/system.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,30 +120,9 @@ void unset_R_Tcldo(DO_FUNC ptr)
120120
return;
121121
}
122122

123-
static int pedepth = 0;
124-
125-
static void depth_cleanup(void *data)
126-
{
127-
pedepth = *(int *)data;
128-
}
129-
130123
void R_ProcessEvents(void)
131124
{
132-
int old_depth = pedepth;
133-
RCNTXT cntxt;
134-
135-
/* do not enter the graphapp message loop recursively */
136-
if (!pedepth && peekevent()) {
137-
pedepth++;
138-
cntxt.cend = &depth_cleanup;
139-
cntxt.cenddata = &old_depth;
140-
begincontext(&cntxt, CTXT_CCODE, R_NilValue, R_BaseEnv, R_BaseEnv,
141-
R_NilValue, R_NilValue);
142-
while (peekevent()) doevent();
143-
endcontext(&cntxt);
144-
depth_cleanup(&old_depth);
145-
}
146-
125+
while (peekevent()) doevent();
147126
if (cpuLimit > 0.0 || elapsedLimit > 0.0) {
148127
#ifdef HAVE_CHECK_TIME_LIMITS
149128
/* switch to using R_CheckTimeLimits after testing on Windows */

0 commit comments

Comments
 (0)