From 5909d87926606c5ba652b76284eb018141cbb9cb Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 5 Nov 2009 19:16:29 +0000
Subject: [PATCH] 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/trunk@228080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_vpb.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 960207de37..b0c9f2f257 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;
 	}