Mercurial > 510Connectbot

changeset 416:07c1da90deab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid null pointer
author Carl Byington <carl@five-ten-sg.com>
date Mon, 27 Oct 2014 13:58:42 -0700
parents 885f2bca6032
children 4dcc071e1feb
files src/com/five_ten_sg/connectbot/ConsoleActivity.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/ConsoleActivity.java	Mon Oct 27 13:55:13 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/ConsoleActivity.java	Mon Oct 27 13:58:42 2014 -0700
@@ -766,7 +766,7 @@
 
                 // pass any touch events back to detector
                 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip);
-                if (terminalView && terminalView.mScaleDetector.onTouchEvent(event)) return true;;
+                if ((terminalView != null) && terminalView.mScaleDetector.onTouchEvent(event)) return true;
                 return gestDetect.onTouchEvent(event);
             }
         });