Merge branch 'master' of github.com:rjwats/esp8266-react

rjwats · rjwats · commit e62b239ea1ea · 2019-04-27T22:46:06.000+01:00
diff --git a/src/WiFiSettingsService.cpp b/src/WiFiSettingsService.cpp
@@ -77,7 +77,7 @@ void WiFiSettingsService::reconfigureWiFiConnection() {
 }
 
 void WiFiSettingsService::readIP(JsonObject& root, String key, IPAddress& _ip){
-  if ( root[key].isNull() || !_ip.fromString(root[key].as<String>())){
+  if ( !root[key].is<String>() || !_ip.fromString(root[key].as<String>())){
     _ip = INADDR_NONE;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void WiFiSettingsService::reconfigureWiFiConnection() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`void WiFiSettingsService::readIP(JsonObject& root, String key, IPAddress& _ip){`
`80`		`- if ( root[key].isNull() \|\| !_ip.fromString(root[key].as<String>())){`
	`80`	`+ if ( !root[key].is<String>() \|\| !_ip.fromString(root[key].as<String>())){`
`81`	`81`	`_ip = INADDR_NONE;`
`82`	`82`	`}`
`83`	`83`	`}`