Changeset 3720

Timestamp:

Aug 24, 2011 8:00:30 AM (13 years ago)

Author:

ming

Message:

Fixed #1334: Fix the problem of getting stuck when trying to quit SDL.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (1 diff)
• pjsip-apps/src/vidgui/vidgui.cpp (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -522 +522 @@
     if (sf->sdl_thread) {
         pj_sem_post(sf->sem);
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+        /* To prevent pj_thread_join() of getting stuck if we are in
+         * the main thread and we haven't finished processing the job
+         * posted by sdl_thread.
+         */
+        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
+#endif
         pj_thread_join(sf->sdl_thread);
     }

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

@@ -105 +105 @@
 void MainWin::quit()
 {
+    if (preview_on)
+        preview();
     pjsua_destroy();
     qApp->quit();