summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-02-13 13:51:08 +0000
committerThorsten Behrens <tbehrens@suse.com>2013-02-15 23:43:40 +0100
commite412e2750a1821e31099e6defc5d62eace061281 (patch)
tree0ef22434a1c7b0400b013bfeb4cb2ff1504d7728 /android
parenteb72920b5a9c5e7a46bb65281bbd0cc41fbba12e (diff)
sdremote: avoid crash when fiddling with elapsed time.
(cherry picked from commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 0de6b32f9431..d3a0352cea1c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -485,7 +485,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
@Override
public boolean onEditorAction(TextView tv, int aID, KeyEvent aEvent) {
- if (aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+ if (aEvent != null && aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
long aTime = 0;
try {