rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

AndroidGCS: Somehow multiple disconnects were triggered.

Browse Source
This commit is contained in:
James Cotton 2012-08-10 02:09:32 -05:00
parent 91a8186e54
commit 7c6b81517e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
View File

@ -128,14 +128,15 @@ public class OPTelemetryService extends Service {
case MSG_DISCONNECT: case MSG_DISCONNECT:
Toast.makeText(getApplicationContext(), "Disconnect requested", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), "Disconnect requested", Toast.LENGTH_SHORT).show();
terminate = true; terminate = true;
activeTelem.interrupt(); if (activeTelem != null) {
try { activeTelem.interrupt();
activeTelem.join(); try {
} catch (InterruptedException e) { activeTelem.join();
e.printStackTrace(); } catch (InterruptedException e) {
e.printStackTrace();
}
activeTelem = null;
} }
activeTelem = null;
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(INTENT_ACTION_DISCONNECTED); intent.setAction(INTENT_ACTION_DISCONNECTED);
sendBroadcast(intent,null); sendBroadcast(intent,null);