Changeset 1223


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

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

Location:
pjproject/branches/pjproject-0.5-stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/pjproject-0.5-stable/pjsip-apps/src/pjsua/main.c

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

    r1205 r1223  
    9696static void stereo_demo(); 
    9797#endif 
     98pj_status_t app_destroy(void); 
    9899 
    99100/***************************************************************************** 
     
    31563157 
    31573158on_error: 
    3158     pjsua_destroy(); 
     3159    app_destroy(); 
    31593160    return status; 
    31603161} 
     
    31683169    status = pjsua_start(); 
    31693170    if (status != PJ_SUCCESS) { 
    3170         pjsua_destroy(); 
     3171        app_destroy(); 
    31713172        return status; 
    31723173    } 
  • pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsua-lib/pjsua_core.c

    r1158 r1223  
    701701        pjsua_var.pool = NULL; 
    702702        pj_caching_pool_destroy(&pjsua_var.cp); 
    703     } 
    704  
    705  
    706     PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); 
    707  
    708     /* End logging */ 
    709     if (pjsua_var.log_file) { 
    710         pj_file_close(pjsua_var.log_file); 
    711         pjsua_var.log_file = NULL; 
    712     } 
    713  
    714     /* Shutdown PJLIB */ 
    715     pj_shutdown(); 
     703 
     704        PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); 
     705 
     706        /* End logging */ 
     707        if (pjsua_var.log_file) { 
     708            pj_file_close(pjsua_var.log_file); 
     709            pjsua_var.log_file = NULL; 
     710        } 
     711 
     712        /* Shutdown PJLIB */ 
     713        pj_shutdown(); 
     714    } 
    716715 
    717716    /* Clear pjsua_var */ 
  • pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsua-lib/pjsua_media.c

    r1155 r1223  
    464464        pjmedia_endpt_destroy(pjsua_var.med_endpt); 
    465465        pjsua_var.med_endpt = NULL; 
    466     } 
    467  
    468     /* Deinitialize sound subsystem */ 
    469     pjmedia_snd_deinit(); 
     466 
     467        /* Deinitialize sound subsystem */ 
     468        pjmedia_snd_deinit(); 
     469    } 
    470470 
    471471    /* Reset RTP port */ 
Note: See TracChangeset for help on using the changeset viewer.