aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/HostListActivity.java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-03-28 18:25:37 -0700
committerKenny Root <kenny@the-b.org>2015-03-28 18:25:37 -0700
commitd472ddde2f9a40abe53c0757a4e8ced6e166afdb (patch)
tree9cba6590d0b8f393289d5d8f63ac180dfc29c6ec /app/src/main/java/org/connectbot/HostListActivity.java
parente018ad68ef2b79cd69ae02468a67b3c6f284a139 (diff)
parent8fda6363bd601ae280052a7bcb5db865edc88138 (diff)
downloadconnectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.tar.gz
connectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.tar.bz2
connectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/org/connectbot/HostListActivity.java')
-rw-r--r--app/src/main/java/org/connectbot/HostListActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index 33bee52..331447a 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -345,8 +345,11 @@ public class HostListActivity extends ListActivity {
// edit, disconnect, delete
MenuItem connect = menu.add(R.string.list_host_disconnect);
- final TerminalBridge bridge = bound.getConnectedBridge(host);
- connect.setEnabled((bridge != null));
+ TerminalBridge bridge = null;
+ if (bound != null) {
+ bridge = bound.getConnectedBridge(host);
+ }
+ connect.setEnabled(bridge != null);
connect.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
bridge.dispatchDisconnect(true);