Use isEmpty instead of isNull in UpdateChannel (#994)

Use isEmpty instead of isNull in ChannelUtil::UpdateChannel to handle both an empty string and no string in the same way. With an IPTV channel rescan the existing values of xmltvid and icon are now preserved when there are no new values found in the scan. Refs #973
MythTV · Dec 11, 2024 · 20a721d · 20a721d
1 parent 3bb9c29
commit 20a721d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mythtv/libs/libmythtv/channelutil.cpp b/mythtv/libs/libmythtv/channelutil.cpp
@@ -1629,15 +1629,15 @@ bool ChannelUtil::UpdateChannel(uint db_mplexid,
         "    visible         = :VISIBLE,   service_type    = :SERVICETYPE "
         "WHERE chanid=:CHANID")
         .arg((!set_channum)       ? "" : "channum  = :CHANNUM,  ",
-             (freqid.isNull())    ? "" : "freqid   = :FREQID,   ",
-             (icon.isNull())      ? "" : "icon     = :ICON,     ",
-             (tvformat.isNull())  ? "" : "tvformat = :TVFORMAT, ",
-             (xmltvid.isNull())   ? "" : "xmltvid  = :XMLTVID,  ",
-             (default_authority.isNull()) ?
-             "" : "default_authority = :AUTHORITY,",
+             (freqid.isEmpty())   ? "" : "freqid   = :FREQID,   ",
+             (icon.isEmpty())     ? "" : "icon     = :ICON,     ",
+             (tvformat.isEmpty()) ? "" : "tvformat = :TVFORMAT, ",
+             (xmltvid.isEmpty())  ? "" : "xmltvid  = :XMLTVID,  ",
+             (default_authority.isEmpty()) ?
+                "" : "default_authority = :AUTHORITY,",
              (recpriority == INT_MIN) ? "" : "recpriority = :RECPRIORITY, ",
-             (tmOffset == INT_MIN) ? "" : "tmOffset = :TMOFFSET, ",
-             (commMethod == INT_MIN) ? "" : "commmethod = :COMMMETHOD, ");
+             (tmOffset    == INT_MIN) ? "" : "tmOffset    = :TMOFFSET, ",
+             (commMethod  == INT_MIN) ? "" : "commmethod  = :COMMMETHOD, ");
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(qstr);