# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1414443522 25200
# Node ID 07c1da90deab96bcee841f34ccdd581b5a362fa8
# Parent  885f2bca6032376785cbd91bd20408985653d891
avoid null pointer

diff -r 885f2bca6032 -r 07c1da90deab src/com/five_ten_sg/connectbot/ConsoleActivity.java
--- 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);
             }
         });