diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-05 19:17:12 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-05 19:17:12 +0000 |
| commit | 8abc73c1339e69de71942a23f6a922953e7f110a (patch) | |
| tree | 1f3d638b73ddf14b83dec053527c6b0a7348915e | |
| parent | e1f25799438e4cd5c0b5efca44fd492b1cacdb69 (diff) | |
Merged revisions 228080 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r228080 | qwell | 2009-11-05 13:16:29 -0600 (Thu, 05 Nov 2009) | 15 lines
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/branches/1.6.0@228081 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_vpb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 78f3ceeea..59111e574 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -2710,7 +2710,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; } |