aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authorJeremy Klein <jklein24@gmail.com>2015-10-15 10:36:41 -0700
committerJeremy Klein <jklein24@gmail.com>2015-10-15 10:36:41 -0700
commit91424dbb94766ddaa013c090dfa4b74107aca6fd (patch)
tree9dc5e14c577f085e25e55775047a280078a597a5 /app/src/main/java
parent783c975a9d532cfcd1177b1cac0322973e576b22 (diff)
parent924fb892f05b175c1424940fe224ba03467945d2 (diff)
downloadconnectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.tar.gz
connectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.tar.bz2
connectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.zip
Merge pull request #297 from rhansby/broken-paste
Fix paste button being permanently disabled because SSH session was not yet open.
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 7241e0e..3aebd41 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -787,7 +787,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
paste.setAlphabeticShortcut('v');
MenuItemCompat.setShowAsAction(paste, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
paste.setIcon(R.drawable.ic_action_paste);
- paste.setEnabled(sessionOpen);
+ paste.setEnabled(activeTerminal);
paste.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
pasteIntoTerminal();
@@ -905,7 +905,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
copy.setEnabled(activeTerminal);
}
- paste.setEnabled(sessionOpen);
+ paste.setEnabled(activeTerminal);
portForward.setEnabled(sessionOpen && canForwardPorts);
urlscan.setEnabled(activeTerminal);
resize.setEnabled(sessionOpen);