merge webui code

This commit is contained in:
Jeff Becker 2016-11-01 10:46:07 -04:00
parent d4a0076aba
commit e5f5f96771
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
7 changed files with 23 additions and 10 deletions

View file

@ -598,7 +598,6 @@ namespace tunnel
hop = hop->next;
}
}
if(pool) pool->OnTunnelBuildResult(tunnel, eBuildResultTimeout);
EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
// delete
it = pendingTunnels.erase (it);
@ -610,7 +609,6 @@ namespace tunnel
case eTunnelStateBuildFailed:
LogPrint (eLogDebug, "Tunnel: pending build request ", it->first, " failed, deleted");
if(pool) pool->OnTunnelBuildResult(tunnel, eBuildResultRejected);
EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
it = pendingTunnels.erase (it);