aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-03-28 18:29:43 -0700
committerKenny Root <kenny@the-b.org>2015-03-28 18:29:43 -0700
commit7ff2fed16c99a87cfc594db88aa2823e522df031 (patch)
tree28328e8172bafcd53a685c84ab8f6b693e74ae9d /src
parent8fda6363bd601ae280052a7bcb5db865edc88138 (diff)
downloadconnectbot-7ff2fed16c99a87cfc594db88aa2823e522df031.tar.gz
connectbot-7ff2fed16c99a87cfc594db88aa2823e522df031.tar.bz2
connectbot-7ff2fed16c99a87cfc594db88aa2823e522df031.zip
Fix last merge request to not undo final of bridge
Change-Id: I47a0d6a0dfcdf735f26dcc09dc4b98d58cb0aa33
Diffstat (limited to 'src')
-rw-r--r--src/org/connectbot/HostListActivity.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index 9cc64f2..de2b5f1 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -345,10 +345,7 @@ public class HostListActivity extends ListActivity {
// edit, disconnect, delete
MenuItem connect = menu.add(R.string.list_host_disconnect);
- TerminalBridge bridge = null;
- if (bound != null) {
- bridge = bound.getConnectedBridge(host);
- }
+ final TerminalBridge bridge = (bound == null) ? null : bound.getConnectedBridge(host);
connect.setEnabled(bridge != null);
connect.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {