diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-28 18:30:15 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-28 18:30:15 -0700 |
| commit | 8d600b2d7409dc059558e6d746c0ab56ba92f677 (patch) | |
| tree | 7bb094fceaaa063301a6223a2f4de8de3e259a38 /app/src/main/java/org/connectbot/HostListActivity.java | |
| parent | d472ddde2f9a40abe53c0757a4e8ced6e166afdb (diff) | |
| parent | 7ff2fed16c99a87cfc594db88aa2823e522df031 (diff) | |
| download | connectbot-8d600b2d7409dc059558e6d746c0ab56ba92f677.tar.gz connectbot-8d600b2d7409dc059558e6d746c0ab56ba92f677.tar.bz2 connectbot-8d600b2d7409dc059558e6d746c0ab56ba92f677.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.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 331447a..607b53f 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/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) { |