Changeset 1224


Ignore:
Timestamp:
Apr 29, 2007 12:31:51 PM (12 years ago)
Author:
bennylp
Message:

Fixed ticket #242: Crash on Windows when no sound device is available

Location:
pjproject/branches/split-3rd-party
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/split-3rd-party/pjsip-apps/src/pjsua/main.c

    r974 r1224  
    8383    app_destroy(); 
    8484 
     85    /* This is on purpose */ 
     86    app_destroy(); 
     87 
    8588    return 0; 
    8689} 
  • pjproject/branches/split-3rd-party/pjsip-apps/src/pjsua/pjsua_app.c

    r1210 r1224  
    9696static void stereo_demo(); 
    9797#endif 
     98pj_status_t app_destroy(void); 
    9899 
    99100/***************************************************************************** 
     
    30873088 
    30883089on_error: 
    3089     pjsua_destroy(); 
     3090    app_destroy(); 
    30903091    return status; 
    30913092} 
     
    30993100    status = pjsua_start(); 
    31003101    if (status != PJ_SUCCESS) { 
    3101         pjsua_destroy(); 
     3102        app_destroy(); 
    31023103        return status; 
    31033104    } 
  • pjproject/branches/split-3rd-party/pjsip/src/pjsua-lib/pjsua_core.c

    r1210 r1224  
    918918        pjsua_var.pool = NULL; 
    919919        pj_caching_pool_destroy(&pjsua_var.cp); 
    920     } 
    921  
    922  
    923     PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); 
    924  
    925     /* End logging */ 
    926     if (pjsua_var.log_file) { 
    927         pj_file_close(pjsua_var.log_file); 
    928         pjsua_var.log_file = NULL; 
    929     } 
    930  
    931     /* Shutdown PJLIB */ 
    932     pj_shutdown(); 
     920 
     921        PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); 
     922 
     923        /* End logging */ 
     924        if (pjsua_var.log_file) { 
     925            pj_file_close(pjsua_var.log_file); 
     926            pjsua_var.log_file = NULL; 
     927        } 
     928 
     929        /* Shutdown PJLIB */ 
     930        pj_shutdown(); 
     931    } 
    933932 
    934933    /* Clear pjsua_var */ 
  • pjproject/branches/split-3rd-party/pjsip/src/pjsua-lib/pjsua_media.c

    r1210 r1224  
    477477        pjmedia_endpt_destroy(pjsua_var.med_endpt); 
    478478        pjsua_var.med_endpt = NULL; 
    479     } 
    480  
    481     /* Deinitialize sound subsystem */ 
    482     pjmedia_snd_deinit(); 
     479 
     480        /* Deinitialize sound subsystem */ 
     481        pjmedia_snd_deinit(); 
     482    } 
    483483 
    484484    /* Reset RTP port */ 
Note: See TracChangeset for help on using the changeset viewer.