1 files changed, 4 insertions, 5 deletions
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index d4d1f2c877..f090326226 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -47,8 +47,9 @@ FX_BOOL CJS_Context::RunScript(const CFX_WideString& script,
   m_bBusy = TRUE;
 
   ASSERT(m_pEventHandler->IsValid());
-  if (!m_pRuntime->AddEventToLoop(m_pEventHandler->TargetName(),
-                                  m_pEventHandler->EventType())) {
+  CJS_Runtime::FieldEvent event(m_pEventHandler->TargetName(),
+                                m_pEventHandler->EventType());
+  if (!m_pRuntime->AddEventToSet(event)) {
     info = JSGetStringFromID(this, IDS_STRING_JSEVENT);
     return FALSE;
   }
@@ -69,9 +70,7 @@ FX_BOOL CJS_Context::RunScript(const CFX_WideString& script,
     info = JSGetStringFromID(this, IDS_STRING_RUN);
   }
 
-  m_pRuntime->RemoveEventInLoop(m_pEventHandler->TargetName(),
-                                m_pEventHandler->EventType());
-
+  m_pRuntime->RemoveEventFromSet(event);
   m_pEventHandler->Destroy();
   m_bBusy = FALSE;