Changeset 3867 in vbox for trunk/src/VBox

Timestamp:

Jul 26, 2007 11:55:50 AM (18 years ago)

Author:

vboxsync

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

23227

Message:

actually assert on the right return code; adapted path to VBoxGuestAdditions.iso

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (2 diffs)
• VBoxGlobal.cpp (modified) (1 diff)
• VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp ¶

@@ -70 +70 @@
 #include <VBox/err.h>
 #endif
+
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 /** class VBoxUSBLedTip
@@ -2298 +2301 @@
     QString src2 = qApp->applicationDirPath() + "/../../release/bin/additions/VBoxGuestAdditions.iso";
 #else
-    QString src1 = qApp->applicationDirPath() + "/VBoxGuestAdditions.iso";
+    char szAppPrivPath[RTPATH_MAX];
+    int rc;
+
+    rc = RTPathAppPrivateNoArch(szAppPrivPath, sizeof(szAppPrivPath));
+    Assert(RT_SUCCESS(rc));
+
+    QString src1 = QString(szAppPrivPath) + "/VBoxGuestAdditions.iso";
     QString src2 = qApp->applicationDirPath() + "/additions/VBoxGuestAdditions.iso";
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp ¶

@@ -2005 +2005 @@
     int rc;
 
-    RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+    rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
     Assert(RT_SUCCESS(rc));
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp ¶

@@ -1766 +1766 @@
     int rc;
 
-    RTPathAppDocs(szDocsPath, sizeof(szDocsPath));
+    rc = RTPathAppDocs(szDocsPath, sizeof(szDocsPath));
     Assert(RT_SUCCESS(rc));