Merge pull request #264 from soward/development

esp8266gateway crashing when receiving I_CONFIG message from new node…
2015-11-24 10:59:12 +01:00
parent c7814878f2 8ff68f0bbe
commit 8e2c8cb420
1 changed files with 5 additions and 1 deletions
@@ -241,7 +241,11 @@ void _processInternalMessages() {
 	} else if (type == I_CONFIG) {
 		// Pick up configuration from controller (currently only metric/imperial)
 		// and store it in eeprom if changed
-		isMetric = _msg.getString()[0] == 'M' ;
+	 	if (_msg.getString() == NULL) {
+                        isMetric = true;
+                } else {
+                        isMetric = _msg.getString()[0] == 'M' ;
+                }
 		_cc.isMetric = isMetric;
 		hwWriteConfig(EEPROM_CONTROLLER_CONFIG_ADDRESS, isMetric);
 	} else if (type == I_PRESENTATION) {