Changeset 46015 in vbox

Timestamp:

May 13, 2013 12:23:40 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85679

Message:

FE/Qt: Message-center: Extending CProgress errors handling for the case when CProgress::GetErrorInfo() returns NULL CVirtualBoxErrorInfo object.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -2416 +2416 @@
 QString UIMessageCenter::formatErrorInfo(const CProgress &progress)
 {
-    return !progress.isOk() ? formatErrorInfo(static_cast<COMBaseWithEI>(progress)) : formatErrorInfo(progress.GetErrorInfo());
+    /* Check for API errors first: */
+    if (!progress.isOk())
+        return formatErrorInfo(static_cast<COMBaseWithEI>(progress));
+
+    /* For progress errors otherwise: */
+    CVirtualBoxErrorInfo errorInfo = progress.GetErrorInfo();
+    /* Handle valid error-info first: */
+    if (!errorInfo.isNull())
+        return formatErrorInfo(errorInfo);
+    /* Handle NULL error-info otherwise: */
+    return tr("Progress result-code: %1")
+             .arg(QString::number(progress.GetResultCode(), 16 /* hex */))
+             .prepend("<!--EOM-->") /* move to details instead of mesasage body */;
 }