[svn-commits] qwell: branch 1.6.0 r228081 - in /branches/1.6.0: ./ channels/chan_vpb.cc

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Nov  5 13:17:12 2009
New Revision: 228081

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_vpb.cc

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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