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

Timestamp:

Sep 16, 2019 1:18:44 PM (5 years ago)

Author:

vboxsync

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

133393

Message:

Main: bugref:9341: The "environment" parameter in the IMachine::launchVMProcess renamed to "environmentChanges" and changed the type from wstring to "safearray of wstrings"

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp (modified) (3 diffs)

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

@@ -2390 +2390 @@
 
     /* Configure environment: */
-    QString strEnv;
+    QVector<QString> astrEnv;
 #ifdef Q_OS_WIN
     /* Allow started VM process to be foreground window: */
@@ -2399 +2399 @@
     const char *pDisplay = RTEnvGet("DISPLAY");
     if (pDisplay)
-        strEnv.append(QString("DISPLAY=%1\n").arg(pDisplay));
+        astrEnv.append(QString("DISPLAY=%1").arg(pDisplay));
     const char *pXauth = RTEnvGet("XAUTHORITY");
     if (pXauth)
-        strEnv.append(QString("XAUTHORITY=%1\n").arg(pXauth));
+        astrEnv.append(QString("XAUTHORITY=%1").arg(pXauth));
 #endif
     QString strType;
@@ -2414 +2414 @@
 
     /* Prepare "VM spawning" progress: */
-    CProgress comProgress = comMachine.LaunchVMProcess(comSession, strType, strEnv);
+    CProgress comProgress = comMachine.LaunchVMProcess(comSession, strType, astrEnv);
     if (!comMachine.isOk())
     {