diff options
author | Kenny Root <kenny@the-b.org> | 2015-03-27 19:18:22 +0000 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-03-27 19:18:22 +0000 |
commit | 9220444f0aeea673bb164b02d9fecca210e8ade4 (patch) | |
tree | 7de5bea191887ed0a7d13424ff1788de0de19903 /app/src/main/java/org/connectbot/service | |
parent | d05cbcb369f0d0f6be587789f7b5925a7f51553a (diff) | |
parent | 582524f7bfa91f575bb6536f90789f674138f2f5 (diff) | |
download | connectbot-9220444f0aeea673bb164b02d9fecca210e8ade4.tar.gz connectbot-9220444f0aeea673bb164b02d9fecca210e8ade4.tar.bz2 connectbot-9220444f0aeea673bb164b02d9fecca210e8ade4.zip |
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/org/connectbot/service')
-rw-r--r-- | app/src/main/java/org/connectbot/service/TerminalBridge.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java index ea19e34..47390d1 100644 --- a/app/src/main/java/org/connectbot/service/TerminalBridge.java +++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java @@ -429,7 +429,7 @@ public class TerminalBridge implements VDUDisplay { disconnectThread.setName("Disconnect"); disconnectThread.start(); - if (immediate) { + if (immediate || (host.getQuickDisconnect() && !host.getStayConnected())) { awaitingClose = true; if (disconnectListener != null) disconnectListener.onDisconnected(TerminalBridge.this); |