aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2009-02-13 16:37:07 +0000
committerKenny Root <kenny@the-b.org>2009-02-13 16:37:07 +0000
commit83a7b07e6c3e9999dc94b2560940ee1c8c862310 (patch)
tree124d99377b745ec5d72da97388f9e4c90cd303cb /src
parent39cb9a59700c1553a24d6a1058a714fbe84af9f8 (diff)
downloadconnectbot-83a7b07e6c3e9999dc94b2560940ee1c8c862310.tar.gz
connectbot-83a7b07e6c3e9999dc94b2560940ee1c8c862310.tar.bz2
connectbot-83a7b07e6c3e9999dc94b2560940ee1c8c862310.zip
Fix crash if you scroll back while connecting and undo meta state alteration for pressing enter
Diffstat (limited to 'src')
-rw-r--r--src/org/connectbot/service/TerminalBridge.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index c014342..f43a870 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -424,7 +424,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
@Override
public void write(byte[] b) {
try {
- if (b != null)
+ if (b != null && stdin != null)
stdin.write(b);
} catch (IOException e) {
Log.e(TAG, "Problem handling incoming data in vt320() thread", e);
@@ -1006,7 +1006,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
metaState &= metaState ^ META_TRANSIENT;
return true;
case KeyEvent.KEYCODE_ENTER:
- ((vt320)buffer).keyTyped(vt320.KEY_ENTER, ' ', getStateForBuffer());
+ ((vt320)buffer).keyTyped(vt320.KEY_ENTER, ' ', 0);
metaState &= metaState ^ META_TRANSIENT;
return true;