Changeset 3720


Ignore:
Timestamp:
Aug 24, 2011 8:00:30 AM (9 years ago)
Author:
ming
Message:

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

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

    r3718 r3720  
    522522    if (sf->sdl_thread) { 
    523523        pj_sem_post(sf->sem); 
     524#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0 
     525        /* To prevent pj_thread_join() of getting stuck if we are in 
     526         * the main thread and we haven't finished processing the job 
     527         * posted by sdl_thread. 
     528         */ 
     529        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false); 
     530#endif 
    524531        pj_thread_join(sf->sdl_thread); 
    525532    } 
  • pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

    r3699 r3720  
    105105void MainWin::quit() 
    106106{ 
     107    if (preview_on) 
     108        preview(); 
    107109    pjsua_destroy(); 
    108110    qApp->quit(); 
Note: See TracChangeset for help on using the changeset viewer.