Mercurial > 510Connectbot
comparison src/com/five_ten_sg/connectbot/ConsoleActivity.java @ 415:885f2bca6032
avoid null pointer
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Mon, 27 Oct 2014 13:55:13 -0700 |
parents | cf81ae79931d |
children | 07c1da90deab |
comparison
equal
deleted
inserted
replaced
414:12b2a3a35afe | 415:885f2bca6032 |
---|---|
764 showEmulatedKeys(); | 764 showEmulatedKeys(); |
765 } | 765 } |
766 | 766 |
767 // pass any touch events back to detector | 767 // pass any touch events back to detector |
768 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip); | 768 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip); |
769 return terminalView.mScaleDetector.onTouchEvent(event) | gestDetect.onTouchEvent(event); | 769 if (terminalView && terminalView.mScaleDetector.onTouchEvent(event)) return true;; |
770 return gestDetect.onTouchEvent(event); | |
770 } | 771 } |
771 }); | 772 }); |
772 } | 773 } |
773 | 774 |
774 /** | 775 /** |