From 5d40ba7478c4540fd9a472aab9a680af6cd84e3a Mon Sep 17 00:00:00 2001
From: Florian <florian.taurer@gmx.at>
Date: Tue, 29 May 2018 23:37:00 +0200
Subject: [PATCH] fixed when service crashed during/after a detection and no
choice was taken
---
.../src/main/java/at/ac/fhstp/sonicontrol/Location.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
index 94700402..db20e97d 100644
--- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
+++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
@@ -139,7 +139,12 @@ public class Location {
public double[] getDetectedDBEntry(){
if(positionLatest[0]==detectedSignalPosition[0]&&positionLatest[1]==detectedSignalPosition[1]){
- detectedSignalPosition = locationData.getDetectedLocation();
+ if(locationData!=null) {
+ detectedSignalPosition = locationData.getDetectedLocation();
+ }else{
+ detectedSignalPosition[0] = 0;
+ detectedSignalPosition[1] = 0;
+ }
}
return detectedSignalPosition;
}
--
GitLab