aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/transport
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-03-27 20:39:11 +0000
committerKenny Root <kenny@the-b.org>2015-03-27 20:39:11 +0000
commit234074da50be20ca5a3c04dc196fa2285ae13ebf (patch)
treedef1c3a82cf6459fd84430627dbe7c0f01e6e764 /app/src/main/java/org/connectbot/transport
parentb8e17fe94360ea131a3425f759e60977547d3d58 (diff)
parent72ebc94de0e7fda14fdef9eecc2f7ca50b92891f (diff)
downloadconnectbot-234074da50be20ca5a3c04dc196fa2285ae13ebf.tar.gz
connectbot-234074da50be20ca5a3c04dc196fa2285ae13ebf.tar.bz2
connectbot-234074da50be20ca5a3c04dc196fa2285ae13ebf.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/org/connectbot/transport')
-rw-r--r--app/src/main/java/org/connectbot/transport/Local.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/java/org/connectbot/transport/Local.java b/app/src/main/java/org/connectbot/transport/Local.java
index 5ace1b0..f7bbf11 100644
--- a/app/src/main/java/org/connectbot/transport/Local.java
+++ b/app/src/main/java/org/connectbot/transport/Local.java
@@ -153,6 +153,11 @@ public class Local extends AbsTransport {
@Override
public void setDimensions(int columns, int rows, int width, int height) {
+ // We are not connected yet.
+ if (shellFd == null) {
+ return;
+ }
+
try {
Exec.setPtyWindowSize(shellFd, rows, columns, width, height);
} catch (Exception e) {