[asterisk-commits] qwell: trunk r228080 - in /trunk: ./ channels/chan_vpb.cc

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Nov  5 13:16:29 2009
New Revision: 228080

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228080
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_vpb.cc

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=228080&r1=228079&r2=228080
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Thu Nov  5 13:16:29 2009
@@ -2703,7 +2703,7 @@
 	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;
 	}