2023-02-12: version 1.3.17 (horchi)\n - Bugfix: Fixed timer creation …

…from WEBIF\n\n
horchi · Feb 12, 2023 · b1a6431 · b1a6431
1 parent 3e78f2a
commit b1a6431
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/HISTORY.h b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.3.16"
-#define VERSION_DATE "11.02.2023"
+#define _VERSION     "1.3.17"
+#define VERSION_DATE "12.02.2023"
 #define DB_API       8
 
 #ifdef GIT_REV
@@ -17,6 +17,9 @@
 /*
  * ------------------------------------
 
+2023-02-12: version 1.3.17 (horchi)
+   - Bugfix: Fixed timer creation from WEBIF
+
 2023-02-11: version 1.3.16 (horchi)
    - Change: Ingnoring unknown config parameters
 

diff --git a/lib/json.c b/lib/json.c
@@ -145,9 +145,9 @@ int getFieldFromJson(json_t* obj, cDbRow* row, const char* fname, const char* ex
          // if (s && strcmp(s, "_not_set_") == 0)
          //    break;
 
-         if (!json_is_null(obj))
+         if (json_is_null(obj))
             value->setNull();
-         if (!json_is_integer(obj))
+         else if (json_is_integer(obj))
             value->setValue(getIntFromJson(obj, jname, 0));
 
          break;

diff --git a/webstore.c b/webstore.c
@@ -321,6 +321,7 @@ int cEpgHttpd::storeTimerJob(json_t* jInData, json_t* response)
 
       if (*type != ttView)
       {
+         // tell("DEBUG: setting starttime of timer to %ld", getLongFromJson(jInData, "starttime", na));
          getFieldFromJson(jInData, &timerRow, "STARTTIME");
          getFieldFromJson(jInData, &timerRow, "ENDTIME");
       }