Ticket #9676: mythsecsto.2.patch

File mythsecsto.2.patch, 828 bytes (added by mythtv@…, 15 years ago)

patch that resolves the issue

  • mythtv/libs/libmyth/util.cpp 

    diff --git a/mythtv/libs/libmyth/util.cpp b/mythtv/libs/libmyth/util.cpp
index c5358b0..0380a48 100644
    a b bool checkTimeZone(const QStringList &master_settings)  
    529529 */
    530530int MythSecsTo(const QDateTime &from, const QDateTime &to)
    531531{
    532    return (from.time().secsTo(to.time()) +
    533            from.date().daysTo(to.date()) * 60 * 60 * 24);
     532   return (from.secsTo(to));
    534533}
    535534
    536535/** \fn MythUTCToLocal(const QDateTime&)
    … … int MythSecsTo(const QDateTime &from, const QDateTime &to)  
    538537 */
    539538QDateTime MythUTCToLocal(const QDateTime &utc)
    540539{
    541     QDateTime local = QDateTime(QDate(1970, 1, 1));
     540    QDateTime local = QDateTime(QDate(1970, 1, 1),QTime(0,0,0),Qt::UTC);
    542541
    543542    int timesecs = MythSecsTo(local, utc);
    544543    QDateTime localdt;