Changeset 3695 for pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

Timestamp:

Aug 15, 2011 9:51:23 AM (13 years ago)

Author:

bennylp

Message:

Re #1327 (vidgui): fixed crash on Linux because SDL_Init() needs to be called prior to creating QApplication

File:

• pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

@@ -20 +20 @@
 #include "vidwin.h"
 
+#include <SDL.h>
 #include <assert.h>
 
@@ -575 +576 @@
 int main(int argc, char *argv[])
 {
+    /* At least on Linux, we have to initialize SDL video subsystem prior to
+     * creating/initializing QApplication, otherwise we'll segfault miserably
+     * in SDL_CreateWindow(). Here's a stack trace if you're interested:
+
+        Thread [7] (Suspended: Signal 'SIGSEGV' received. Description: Segmentation fault.)
+        13 XCreateIC()
+        12 SetupWindowData()
+        11 X11_CreateWindow()
+        10 SDL_CreateWindow()
+        ..
+     */
+    if ( SDL_InitSubSystem(SDL_INIT_VIDEO) < 0 ) {
+        printf("Unable to init SDL: %s\n", SDL_GetError());
+        return 1;
+    }
+
     QApplication app(argc, argv);
+
     MainWin win;
     win.show();
@@ -584 +602 @@
     }
 
-    /* Initialize our module to handle otherwise unhandled request */
-    pjsip_endpt_register_module(pjsua_get_pjsip_endpt(),
-                                &mod_default_handler);
+    /* We want to be registrar too! */
+    if (pjsua_get_pjsip_endpt()) {
+        pjsip_endpt_register_module(pjsua_get_pjsip_endpt(),
+                                    &mod_default_handler);
+    }
 
     return app.exec();