activex: stop processing events on closing ActiveX plugin

d6b83653 · Jean-Paul Saman · 18fe2d12 · d6b83653
Commit d6b83653 authored Mar 17, 2010 by Jean-Paul Saman
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

projects/activex/connectioncontainer.cpp projects/activex/connectioncontainer.cpp +8 -1

No files found.
--- a/projects/activex/connectioncontainer.cpp
+++ b/projects/activex/connectioncontainer.cpp
@@ -163,10 +163,17 @@ DWORD WINAPI ThreadProcEventHandler(LPVOID lpParam)
            pCPC->_q_events.pop();
            pCPC->_p_events->fireEvent(ev->_dispId, &ev->_dispParams);
            delete ev;
+
+
+            if (!pCPC->isRunning)
+            {
+                LeaveCriticalSection(&(pCPC->csEvents));
+                goto out;
+            }
        }
        LeaveCriticalSection(&(pCPC->csEvents));
    }
-
+out:
    CoUninitialize();
    return 0;
 }