[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kicker/applets/clock
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-07-06 20:31:07
Message-ID: 1120681867.081687.19962.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 432268 by aseigo:

don't die when we get a null value back for the timezone
based on a patch by Michel Hermeir
thanks Michel!


 M  +12 -1     zone.cpp  


--- trunk/KDE/kdebase/kicker/applets/clock/zone.cpp #432267:432268
@@ -76,7 +76,18 @@
 int Zone::calc_TZ_offset(const QString& zone, bool reset)
 {
   const KTimezone *z = zone.isEmpty() ? m_zoneDb.local() : m_zoneDb.zone(zone);
-  return -z->offset(Qt::LocalTime);
+
+  if (!z)
+  {
+    z = m_zoneDb.local();
+  }
+
+  if (z)
+  {
+    return -z->offset(Qt::LocalTime);
+  }
+
+  return 0;
 }
 
 void Zone::readZoneList(KListView *listView )
[prev in list] [next in list] [prev in thread] [next in thread]