From 7e89bf01a1e8829d27cc35e051c06fd0de54a321 Mon Sep 17 00:00:00 2001 From: horchi Date: Mon, 24 Feb 2020 20:21:54 +0100 Subject: 2020-02-24: version 1.1.158 (horchi)\n - bugfix: Fixed move of timer by webif\n\n --- HISTORY.h | 7 +++++-- webstore.c | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index f6bd680..e5af584 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.157" -#define VERSION_DATE "17.02.2020" +#define _VERSION "1.1.158" +#define VERSION_DATE "24.02.2020" #define DB_API 7 #ifdef GIT_REV @@ -19,6 +19,9 @@ * * +2020-02-24: version 1.1.158 (horchi) + - bugfix: Fixed move of timer by webif + 2020-02-17: version 1.1.157 (horchi) - bugfix: Fixed conflicting timer start times diff --git a/webstore.c b/webstore.c index c11d96c..4e434e2 100644 --- a/webstore.c +++ b/webstore.c @@ -389,9 +389,12 @@ int cEpgHttpd::modifyCreateTimer(cDbRow* timerRow) if (knownTimer) { - timerDb->copyValues(timerRow, cDBS::ftPrimary); + // timerDb->copyValues(timerRow, cDBS::ftPrimary); + timerDb->setValue("ID", timerRow->getIntValue("ID")); - if (!timerDb->find()) + // if (!timerDb->find()) + + if (!selectTimerById->find()) { connection->commit(); @@ -431,13 +434,13 @@ int cEpgHttpd::modifyCreateTimer(cDbRow* timerRow) // create new on other vdr timerDb->copyValues(timerRow, cDBS::ftData); // takeover all data (possibly modified by user) + timerDb->setValue("VDRUUID", timerRow->getStrValue("VDRUUID")); timerDb->setValue("ID", 0); timerDb->setCharValue("ACTION", taCreate); status += timerDb->insert(); if (status == success) - tell(1, "Created 'move' request for timer (%d) at vdr '%s'", - timerid, timerDb->getStrValue("VDRUUID")); + tell(1, "Created 'move' request for timer (%d) to '%s'", timerid, timerDb->getStrValue("VDRUUID")); } else { -- cgit v1.2.3