Merge branch 'master' into root

This commit is contained in:
Cameron Gutman
2014-10-03 23:09:40 -07:00
+1 -1
View File
@@ -681,8 +681,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
private void stopConnection() { private void stopConnection() {
if (connecting || connected) { if (connecting || connected) {
conn.stop();
connecting = connected = false; connecting = connected = false;
conn.stop();
} }
// Close the Evdev watcher to allow use of captured input devices // Close the Evdev watcher to allow use of captured input devices