Changeset 11695 for trunk/FACT++/dim/src/diccpp.cxx

Timestamp:

07/29/11 09:54:56 (13 years ago)

Author:

tbretz

Message:

Updated from dim_v19r22 to dim_v19r23

File:

• trunk/FACT++/dim/src/diccpp.cxx (modified) (3 diffs)

trunk/FACT++/dim/src/diccpp.cxx

@@ -1111 +1111 @@
 
         DimCore::inCallback = 2;
-        DimClient::itsCltError->errorHandler(severity, code, msg);
+        if(DimClient::itsCltError != 0)
+                DimClient::itsCltError->errorHandler(severity, code, msg);
         DimCore::inCallback = 0;
 }
@@ -1118 +1119 @@
 void DimClient::addErrorHandler(DimErrorHandler *handler)
 {
-        DimClient::itsCltError = handler;
-        dic_add_error_handler(clt_error_user_routine);
+        if(handler == 0)
+        {
+                dic_add_error_handler(0);
+                DimClient::itsCltError = 0;
+        }
+        else
+        {
+                DimClient::itsCltError = handler;
+                dic_add_error_handler(clt_error_user_routine);
+        }
 }
 
@@ -1207 +1216 @@
         return list;
 }
+
+int DimClient::inCallback()
+{
+        if(DimCore::inCallback)
+                return 1;
+        return 0;
+}