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

diff -r 12b2a3a35afe -r 885f2bca6032 src/com/five_ten_sg/connectbot/ConsoleActivity.java
--- a/src/com/five_ten_sg/connectbot/ConsoleActivity.java	Sat Oct 25 10:52:39 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/ConsoleActivity.java	Mon Oct 27 13:55:13 2014 -0700
@@ -766,7 +766,8 @@
 
                 // pass any touch events back to detector
                 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip);
-                return  terminalView.mScaleDetector.onTouchEvent(event) | gestDetect.onTouchEvent(event);
+                if (terminalView && terminalView.mScaleDetector.onTouchEvent(event)) return true;;
+                return gestDetect.onTouchEvent(event);
             }
         });
     }