Changeset 4127 in vbox

Timestamp:

Aug 13, 2007 11:05:15 AM (18 years ago)

Author:

vboxsync

Message:

Frontends: Don't pass DISPLAY=<NULL> to the VM process when there is no DISPLAY variable in the initiator's environment.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -4235 +4235 @@
 #ifdef RT_OS_LINUX
         /* make sure the VM process will start on the same display as VBoxManage */
-        env = Utf8StrFmt ("DISPLAY=%s", getenv ("DISPLAY"));
+        {
+            const char *display = getenv ("DISPLAY");
+            if (display)
+                env = Utf8StrFmt ("DISPLAY=%s", display);
+        }
 #endif
         ComPtr<IProgress> progress;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -847 +847 @@
 #if defined (Q_WS_X11)
     /* make sure the VM process will start on the same display as the Selector */
-    env.sprintf ("DISPLAY=%s", getenv ("DISPLAY"));
+    {
+        const char *display = getenv ("DISPLAY");
+        if (display)
+            env.sprintf ("DISPLAY=%s", display);
+    }
 #endif