diff options
| author | stevenjb <stevenjb@chromium.org> | 2014-10-07 08:52:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 15:52:42 +0000 |
| commit | 78cbad821d918bab53eab9f28e56923f5173f604 (patch) | |
| tree | 50e87871d487c2fc85c318380fe8cb9d8b2d511b | |
| parent | 47160417e21b5faeeabab4569801706e2f2389bc (diff) | |
| download | chromium_src-78cbad821d918bab53eab9f28e56923f5173f604.zip chromium_src-78cbad821d918bab53eab9f28e56923f5173f604.tar.gz chromium_src-78cbad821d918bab53eab9f28e56923f5173f604.tar.bz2 | |
Allow disconnect for connecting networks
BUG=128457
Review URL: https://codereview.chromium.org/633713002
Cr-Commit-Position: refs/heads/master@{#298491}
| -rw-r--r-- | chromeos/network/network_connection_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc index 332319a..ebfe949b 100644 --- a/chromeos/network/network_connection_handler.cc +++ b/chromeos/network/network_connection_handler.cc @@ -325,10 +325,11 @@ void NetworkConnectionHandler::DisconnectNetwork( InvokeErrorCallback(service_path, error_callback, kErrorNotFound); return; } - if (!network->IsConnectedState()) { + if (!network->IsConnectedState() && !network->IsConnectingState()) { InvokeErrorCallback(service_path, error_callback, kErrorNotConnected); return; } + pending_requests_.erase(service_path); CallShillDisconnect(service_path, success_callback, error_callback); } |