diff -r 74e01be179dc -r a48df3027569 core-legacy/sourcehook/test/test1.cpp --- a/core-legacy/sourcehook/test/test1.cpp Sat Dec 19 17:20:54 2009 -0800 +++ b/core-legacy/sourcehook/test/test1.cpp Sun Jan 10 02:46:18 2010 -0500 @@ -426,9 +426,7 @@ // 1) SH_CALL it and call it normally - return true; SH_CALL(pTest, &Test::F1)(); - pTest->F1(); @@ -472,16 +470,23 @@ // 4) Test source-level compat with callclasses SourceHook::CallClass *pCC = SH_GET_CALLCLASS(pTest); + // bug 4210 + SH_CALL(pCC, &Test::F1)(); + + CHECK_STATES((&g_States, + new State_F1_Called, + NULL), "bug 4210"); + SH_CALL(pCC, &Test::F1)(); pTest->F1(); - SH_RELEASE_CALLCLASS(pCC); - CHECK_STATES((&g_States, new State_F1_Called, new State_F1_PreHandler_Called(&f1_handlers), NULL), "Part 4"); + SH_RELEASE_CALLCLASS(pCC); + // 5) Check ignore / supercede g_F1Pre_WhatToDo = MRES_SUPERCEDE; SH_CALL(pTest, &Test::F1)();