Diff: measurement/Signal.cpp

Revision:

123:3e4a1ed4bad5

Parent:

118:e831cdb799ab

Child:

124:311fa85af2b3

--- a/measurement/Signal.cpp	Wed May 20 14:30:26 2015 +0000
+++ b/measurement/Signal.cpp	Wed May 27 09:22:24 2015 +0000
@@ -16,15 +16,16 @@
         static const char *fmt = "104,%ld,%d,%d\r\n";
         static char signal[27] = {0};
         DeviceInfo::SignalQuality *p = deviceInfo.signalQuality();
-        if (p == NULL)
-                return 0;
-        else if (p && p->rssi)
+
+        if (p && p->rssi)
                 snprintf(signal, sizeof(signal), "Network: %d dBm", p->rssi);
         else
                 strncpy(signal, "Network: no coverage", sizeof(signal));
         if (strcmp(LCDDisplay::inst().getSecondLine(), signal)) {
                 LCDDisplay::inst().setSecondLine(signal);
         }
+        if (p == NULL)
+                return 0;
 
         int data[2] = { p->rssi, p->ber };
         if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_SIG &&