0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes the crash (but not the bug itself) of bug #16747.

Browse source 
The bug can now be described as _Shows no progress while attempting to
upload add-on.
This commit is contained in:
Guillermo Biset 2010-08-19 06:03:54 +00:00
parent 492935d2ae
commit e7e3110dce
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/network_manager_ana.cpp
View file

@ -1053,7 +1053,10 @@ network::connection ana_network_manager::read_from( network::connection connecti
ana::net_id id( connection_num );
it = std::find_if( components_.begin(), components_.end(),
boost::bind(&ana_component::get_id, _1) == id );
(boost::bind(&ana_component::get_wesnoth_id, _1) == connection_num)
|| (boost::bind(&ana_component::get_id, _1) == id ) );
//Make a broad attempt at finding it, test for both ANA's id and the assigned one.
if ( it != components_.end())
return read_from(it, cfg, timeout_ms);
@ -1094,16 +1097,16 @@ network::statistics ana_network_manager::get_send_stats(network::connection hand
{
if ( handle != 0 )
{
ana::net_id id( handle );
// ana::net_id id( handle );
std::set< ana_component* >::iterator it;
it = std::find_if( components_.begin(), components_.end(),
boost::bind(&ana_component::get_id, _1) == id );
boost::bind(&ana_component::get_wesnoth_id, _1) == handle );
if ( it != components_.end() )
return (*it)->get_send_stats( );
else
throw std::runtime_error("Received message from a non connected component.");
throw std::runtime_error("Trying to get stats from the wrong component.");
}
else if( ! components_.empty() )
{