aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/ConsoleActivity.java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-09-05 22:25:39 -0700
committerKenny Root <kenny@the-b.org>2015-09-05 22:40:49 -0700
commitb4c5b9102d6c7dbc7e37c0f883a0980292e31be4 (patch)
treedfaccdfd1d117543d73e8de78e64e3e7bc84b11f /app/src/main/java/org/connectbot/ConsoleActivity.java
parent6765dc2863a29c2dbbd11c93c4f2445a580723c2 (diff)
downloadconnectbot-b4c5b9102d6c7dbc7e37c0f883a0980292e31be4.tar.gz
connectbot-b4c5b9102d6c7dbc7e37c0f883a0980292e31be4.tar.bz2
connectbot-b4c5b9102d6c7dbc7e37c0f883a0980292e31be4.zip
ActionBar can be null, so check first
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java24
1 files changed, 13 insertions, 11 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 95d21d8..289cc2a 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -605,18 +605,20 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
actionBar = getSupportActionBar();
- actionBar.setDisplayHomeAsUpEnabled(true);
- if (titleBarHide) {
- actionBar.hide();
- }
- actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
- public void onMenuVisibilityChanged(boolean isVisible) {
- inActionBarMenu = isVisible;
- if (isVisible == false) {
- hideEmulatedKeys();
- }
+ if (actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ if (titleBarHide) {
+ actionBar.hide();
}
- });
+ actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
+ public void onMenuVisibilityChanged(boolean isVisible) {
+ inActionBarMenu = isVisible;
+ if (isVisible == false) {
+ hideEmulatedKeys();
+ }
+ }
+ });
+ }
final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
if (!hardKeyboard) {