Prevent infinite loop on one time run

sources/inverter-cli/inverter.cpp

@@ -158,6 +158,7 @@ bool cInverter::query(const char *cmd, int replysize) {
 void cInverter::poll() {
     int n,j;
     extern const int qpiri, qpiws, qmod, qpigs;
+    extern const bool runOnce;
 
     while (true) {
 
@@ -198,8 +199,12 @@ void cInverter::poll() {
                 ups_qpiws_changed = true;
             }
         }
-
         sleep(5);
+        // leave after delay to let main thread printout data
+        if (runOnce) {
+            ups_leave = true;
+            exit(0);
+        }        
     }
 }
 

sources/inverter-cli/main.cpp

@@ -25,6 +25,7 @@
 
 bool debugFlag = false;
 bool runOnce = false;
+bool ups_leave = false;
 
 cInverter *ups = NULL;
 
@@ -278,16 +279,14 @@ int main(int argc, char* argv[]) {
                 // Delete reply string so we can update with new data when polled again...
                 delete reply1;
                 delete reply2;
-
-                if(runOnce) {
-                    // Do once and exit instead of loop endlessly
-                    lprintf("INVERTER: All queries complete, exiting loop.");
-                    exit(0);
-                }
             }
-        }
-
+        } else if (ups_leave) {
+            // If not reading response of oneshot run, exit instead of loop endlessly
+            lprintf("INVERTER: All queries complete, exiting loop.");
+            exit(0);
+        }  
         sleep(1);
+
     }
 
     if (ups)

sources/inverter-cli/main.h

@@ -5,6 +5,8 @@
 #include "inverter.h"
 
 extern bool debugFlag;
+extern bool ups_leave;
+
 extern atomic_bool ups_data_changed;
 
 extern atomic_bool ups_status_changed;