sourcehook/sourcehook.cpp
changeset 393 24e9ac80de6e
parent 387 093c72464b35
child 399 3cd3255adb76
     1.1 --- a/sourcehook/sourcehook.cpp	Mon Oct 08 17:22:57 2007 +0000
     1.2 +++ b/sourcehook/sourcehook.cpp	Mon Oct 08 17:23:23 2007 +0000
     1.3 @@ -698,20 +698,23 @@
     1.4  
     1.5  			CHookManagerContainer::iterator cont_iter = container.find(CHookManager::Descriptor(plug, pubFunc));
     1.6  
     1.7 -			for (List<CVfnPtr>::iterator vfnptr_iter = cont_iter->GetVfnPtrList().begin();
     1.8 -				vfnptr_iter != cont_iter->GetVfnPtrList().end(); ++vfnptr_iter)
     1.9 +			if (cont_iter != container.end())
    1.10  			{
    1.11 -				for (List<CIface>::iterator iface_iter = vfnptr_iter->GetIfaceList().begin();
    1.12 -					iface_iter != vfnptr_iter->GetIfaceList().end(); ++iface_iter)
    1.13 +				for (List<CVfnPtr>::iterator vfnptr_iter = cont_iter->GetVfnPtrList().begin();
    1.14 +					vfnptr_iter != cont_iter->GetVfnPtrList().end(); ++vfnptr_iter)
    1.15  				{
    1.16 -					List<CHook>::iterator hook_iter;
    1.17 -					for (hook_iter = iface_iter->GetPreHookList().begin();
    1.18 -						hook_iter != iface_iter->GetPreHookList().end(); ++hook_iter)
    1.19 -						removehooks.push_back(hook_iter->GetID());
    1.20 -
    1.21 -					for (hook_iter = iface_iter->GetPostHookList().begin();
    1.22 -						hook_iter != iface_iter->GetPostHookList().end(); ++hook_iter)
    1.23 -						removehooks.push_back(hook_iter->GetID());
    1.24 +					for (List<CIface>::iterator iface_iter = vfnptr_iter->GetIfaceList().begin();
    1.25 +						iface_iter != vfnptr_iter->GetIfaceList().end(); ++iface_iter)
    1.26 +					{
    1.27 +						List<CHook>::iterator hook_iter;
    1.28 +						for (hook_iter = iface_iter->GetPreHookList().begin();
    1.29 +							hook_iter != iface_iter->GetPreHookList().end(); ++hook_iter)
    1.30 +							removehooks.push_back(hook_iter->GetID());
    1.31 +	
    1.32 +						for (hook_iter = iface_iter->GetPostHookList().begin();
    1.33 +							hook_iter != iface_iter->GetPostHookList().end(); ++hook_iter)
    1.34 +							removehooks.push_back(hook_iter->GetID());
    1.35 +					}
    1.36  				}
    1.37  			}
    1.38