Changeset 48137 in vbox

Timestamp:

Aug 29, 2013 6:19:59 AM (12 years ago)

Author:

vboxsync

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

88518

Message:

FE/Qt and FE/SDL: always call XInitThreads() before any other Xlib calls.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• VirtualBox/src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -733 +733 @@
 DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+#ifdef Q_WS_X11
+    if (!XInitThreads())
+        return 1;
+#endif
 #ifdef VBOXSDL_WITH_X11
     /*
@@ -3043 +3047 @@
 int main(int argc, char **argv)
 {
+#ifdef Q_WS_X11
+    if (!XInitThreads())
+        return 1;
+#endif
     /*
      * Before we do *anything*, we initialize the runtime.

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

@@ -300 +300 @@
     int iResultCode = 1;
 
+#ifdef Q_WS_X11
+    if (!XInitThreads())
+        return 1;
+#endif
+
     /* Simulate try-catch block: */
     do
@@ -537 +542 @@
      * Don't do this if we are only starting the selector window. */
     bool fInitSUPLib = false;
+#ifdef Q_WS_X11
+    if (!XInitThreads())
+        return 1;
+#endif
     for (int i = 1; i < argc; ++i)
     {