Changeset 54774 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 16, 2015 10:29:40 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: in SnapshotAgeFormat(), call QDateTime::currentDateTime() only once and be prepared against a wrong host time

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -207 +207 @@
         /* Age: [date time|%1d ago|%1h ago|%1min ago|%1sec ago] */
         SnapshotAgeFormat ageFormat;
-        if (mTimestamp.daysTo (QDateTime::currentDateTime()) > 30)
-        {
-            age = VBoxSnapshotsWgt::tr (" (%1)").arg (mTimestamp.toString (Qt::LocalDate));
+        QDateTime now = QDateTime::currentDateTime();
+        QDateTime then = mTimestamp;
+        if (then > now)
+            then = now; /* can happen if the host time is wrong */
+        if (then.daysTo (now) > 30)
+        {
+            age = VBoxSnapshotsWgt::tr (" (%1)").arg (then.toString (Qt::LocalDate));
             ageFormat = AgeMax;
         }
-        else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60 * 24)
-        {
-            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::daysToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60 / 24));
+        else if (then.secsTo (now) > 60 * 60 * 24)
+        {
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::daysToString(then.secsTo (now) / 60 / 60 / 24));
             ageFormat = AgeInDays;
         }
-        else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60)
-        {
-            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::hoursToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60));
+        else if (then.secsTo (now) > 60 * 60)
+        {
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::hoursToString(then.secsTo (now) / 60 / 60));
             ageFormat = AgeInHours;
         }
-        else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60)
-        {
-            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::minutesToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60));
+        else if (then.secsTo (now) > 60)
+        {
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::minutesToString(then.secsTo (now) / 60));
             ageFormat = AgeInMinutes;
         }
         else
         {
-            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::secondsToString(mTimestamp.secsTo (QDateTime::currentDateTime())));
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::secondsToString(then.secsTo (now)));
             ageFormat = AgeInSeconds;
         }