Check URL and trigger push from contents

lbussy · Mar 4, 2020 · 4ed459b · 4ed459b
1 parent 99166e9
commit 4ed459b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/urltarget.cpp b/src/urltarget.cpp
@@ -31,8 +31,11 @@ URLTarget* URLTarget::getInstance() {
         single->target = new PushTarget;
         single->target->ip = INADDR_NONE;
 
+        // Grab correct URL for target type
+        strlcpy(single->target->url, single->config->targeturl, sizeof(single->config->targeturl)); // Unique to URL Target
+        //
         // Enable target and target name
-        single->target->target.enabled = (String(single->targeturl).length() > 3);
+        single->target->target.enabled = (String(single->target->url).length() > 3);
         strlcpy(single->target->target.name, single->target_name, sizeof(single->target_name));
         //
         // Check return body for success
@@ -58,18 +61,16 @@ URLTarget* URLTarget::getInstance() {
         single->target->tempFormat.enabled = single->tempformat_enabled;
         strlcpy(single->target->tempFormat.name, single->tempformat_name, sizeof(single->tempformat_name));
         //
-        // Grab correct URL for target type
-        strlcpy(single->target->url, single->config->targeturl, sizeof(single->config->targeturl)); // Unique to URL Target
-        //
     }
     return single;
 }
 
 bool URLTarget::push() {
     Log.verbose(F("Triggered %s push." CR), single->target->target.name);
     strlcpy(single->target->url, single->config->targeturl, sizeof(single->config->targeturl)); // Unique to URL Target
+    single->target->target.enabled = (String(single->target->url).length() > 3);                // Unique to URL Target
     LCBUrl lcburl;
-    if (single->target->apiName.enabled) {
+    if (single->target->target.enabled) {
         if (lcburl.setUrl(String(single->target->url))) {
             IPAddress resolvedIP = resolveHost(lcburl.getHost().c_str());
             if (resolvedIP == INADDR_NONE) {