summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/connection_to_host.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 04:51:04 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 04:51:04 +0000
commit35600774ad886e67eb7c274c764dbdfabfc9a24d (patch)
tree7b526ea905ddaba25d22690738c3faca8f17bb38 /remoting/protocol/connection_to_host.cc
parent4be62b775245fd0b9b95b5e3dcb6eb1aba590c06 (diff)
downloadchromium_src-35600774ad886e67eb7c274c764dbdfabfc9a24d.zip
chromium_src-35600774ad886e67eb7c274c764dbdfabfc9a24d.tar.gz
chromium_src-35600774ad886e67eb7c274c764dbdfabfc9a24d.tar.bz2
Return NULL form ConnectionToHost::input_stub() until connection is connected.
BUG=111549 Review URL: http://codereview.chromium.org/9289060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.cc')
-rw-r--r--remoting/protocol/connection_to_host.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index ca89b44..1ab6bd1 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -43,10 +43,14 @@ ConnectionToHost::~ConnectionToHost() {
}
InputStub* ConnectionToHost::input_stub() {
+ if (event_dispatcher_.get() && !event_dispatcher_->is_connected())
+ return NULL;
return event_dispatcher_.get();
}
HostStub* ConnectionToHost::host_stub() {
+ if (control_dispatcher_.get() && !control_dispatcher_->is_connected())
+ return NULL;
return control_dispatcher_.get();
}