Fixed|Updater: Printing last checked time when never actually checked

The case of "never checked" needs to be handled separately.
skyjake · Apr 9, 2013 · 169c6c3 · 169c6c3
1 parent bd304d1
commit 169c6c3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/doomsday/client/src/updater/updater.cpp b/doomsday/client/src/updater/updater.cpp
@@ -599,6 +599,13 @@ void Updater_ShowSettings(void)
 
 void Updater_PrintLastUpdated(void)
 {
-    Con_Message("Latest update check was made %s.",
-                UpdaterSettings().lastCheckAgo().toLatin1().constData());
+    de::String ago = UpdaterSettings().lastCheckAgo();
+    if(ago.isEmpty())
+    {
+        Con_Message("Never checked for updates.");
+    }
+    else
+    {
+        Con_Message("Latest update check was made %s.", ago.toLatin1().constData());
+    }
 }
diff --git a/doomsday/client/src/updater/updatersettings.cpp b/doomsday/client/src/updater/updatersettings.cpp
@@ -191,6 +191,8 @@ de::NativePath UpdaterSettings::defaultDownloadPath()
 de::String UpdaterSettings::lastCheckAgo() const
 {
     de::Time when = lastCheckTime();
+    if(!when.isValid()) return ""; // Never checked.
+
     de::TimeDelta delta = when.since();
 
     int t;

diff --git a/doomsday/client/src/updater/updatersettingsdialog.cpp b/doomsday/client/src/updater/updatersettingsdialog.cpp
@@ -119,8 +119,16 @@ DENG2_PIMPL(UpdaterSettingsDialog)
     {
         UpdaterSettings st;
 
-        lastChecked->setText(tr("<small>Last checked %1.</small>")
-                             .arg(st.lastCheckAgo()));
+        String ago = st.lastCheckAgo();
+        if(!ago.isEmpty())
+        {
+            lastChecked->setText(tr("<small>Last checked %1.</small>")
+                                 .arg(st.lastCheckAgo()));
+        }
+        else
+        {
+            lastChecked->setText(tr("<small>Never checked.</small>"));
+        }
 
         autoCheck->setChecked(!st.onlyCheckManually());
         freqList->setEnabled(!st.onlyCheckManually());