aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-05 19:16:29 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-05 19:16:29 +0000
commitf9ce6c731f02deb285cfd7cf09bb94634736d12f (patch)
treeb3ca701fd012285c7053fc98d54e9d9db1af648d
parentf22eb8df191b34a1b282423954465dd62be3d9d8 (diff)
Merged revisions 228079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228079 | qwell | 2009-11-05 13:14:25 -0600 (Thu, 05 Nov 2009) | 8 lines Fix crash on VPB exception when no hardware is present. (closes issue #14970) Reported by: tzafrir Patches: vpb_exception.diff uploaded by tzafrir (license 46) Tested by: markwaters ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@228080 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_vpb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 960207de3..b0c9f2f25 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2703,7 +2703,7 @@ static enum ast_module_load_result load_module()
int num_cards = 0;
try {
num_cards = vpb_get_num_cards();
- } catch (VpbException e) {
+ } catch (std::exception e) {
ast_log(LOG_ERROR, "No Voicetronix cards detected\n");
return AST_MODULE_LOAD_DECLINE;
}