diff -r d43e4c343426 -r dd85920ecaaf core-legacy/CPlugin.cpp --- a/core-legacy/CPlugin.cpp Sat Nov 15 21:10:13 2008 -0600 +++ b/core-legacy/CPlugin.cpp Sat Nov 15 21:13:38 2008 -0600 @@ -210,7 +210,7 @@ continue; } (*event).got_vsp = true; - (*event).event->OnVSPListening(&g_VspListener); + (*event).event->OnVSPListening(g_pRealVspCallbacks); } } } @@ -406,8 +406,8 @@ //if (pl->m_API->GetApiVersion() >= 4) pl->m_API->AllPluginsLoaded(); } - if (g_VspListener.IsRootLoadMethod() - || (g_VspListener.IsLoaded() && g_SmmAPI.VSPEnabled())) + if (g_bIsBridgedAsVsp || + (g_VspListener.IsLoaded() && g_SmmAPI.VSPEnabled())) { SourceHook::List::iterator event; for (event = pl->m_Events.begin(); @@ -415,11 +415,9 @@ event++) { if (pl->m_API->GetApiVersion() < 10 || (*event).got_vsp) - { continue; - } (*event).got_vsp = true; - (*event).event->OnVSPListening(&g_VspListener); + (*event).event->OnVSPListening(g_pRealVspCallbacks); } } } else {