From: Jason Parker <jparker@digium.com>
Date: Thu, 5 Nov 2009 19:17:12 +0000 (+0000)
Subject: Merged revisions 228080 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6799f73d2ec973c5a7fe0fa043d0362340818816;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@228081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 78f3ceeeaf..59111e574f 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;
 	}