[Csp-commits] svn:csp r1495 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:17:04 -0800 (Fri, 11 Mar 2005)
New Revision: 1495

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/CSPSim.cpp
Log:
Add exception handlers for csp and simdata exceptions thrown from the
main loop.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1495

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:13:59 UTC (rev 1494)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:17:04 UTC (rev 1495)
@@ -7,6 +7,9 @@
  * Add a new data channel method for setting and pushing a value in one
    call.  Also add a method for safely reading an invalid channel.
 
+ * Add exception handlers for csp and simdata exceptions thrown from the
+   main loop.
+
 2005-03-05: onsight
  * Fix a couple minor warnings under gcc.
 

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-03-12 06:13:59 UTC (rev 1494)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-03-12 06:17:04 UTC (rev 1495)
@@ -605,6 +605,12 @@
 		cleanup();
 		::exit(1);
 	}
+	catch(simdata::Exception & pEx) {
+		csp::SimDataFatalException(pEx, "mainloop");
+	}
+	catch(csp::Exception & pEx) {
+		csp::FatalException(pEx, "initialization");
+	}
 	catch(...) {
 		CSP_LOG(APP, ERROR, "MAIN: Unexpected exception, GLErrorNUM: " << glGetError());
 		cleanup();