1.1 --- a/core/ConVarManager.cpp	Mon Aug 12 00:42:56 2013 +0100
     1.2 +++ b/core/ConVarManager.cpp	Mon Aug 12 00:44:22 2013 +0100
     1.3 @@ -304,14 +304,19 @@
     1.4  		delete pConVarList;
     1.5  	}
     1.6  
     1.7 +	const IPluginRuntime * pRuntime = plugin->GetRuntime();
     1.8 +
     1.9  	/* Remove convar queries for this plugin that haven't returned results yet */
    1.10 -	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end(); iter++)
    1.11 +	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
    1.12  	{
    1.13  		ConVarQuery &query = (*iter);
    1.14 -		if (query.pCallback->GetParentRuntime() == plugin->GetRuntime())
    1.15 +		if (query.pCallback->GetParentRuntime() == pRuntime)
    1.16  		{
    1.17 -			m_ConVarQueries.erase(iter);
    1.18 +			iter = m_ConVarQueries.erase(iter);
    1.19 +			continue;
    1.20  		}
    1.21 +
    1.22 +		++iter;
    1.23  	}
    1.24  }
    1.25