[Greater-commits] r296 - trunk/Administration

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-29 12:15:15 +0200 (Wed, 29 Jun 2011)
New Revision: 296

Modified:
   trunk/Administration/ExportDialog.cpp
   trunk/Administration/ImportDialog.cpp
Log:
XMLPlatformUtils::Terminate is an optional call that is not neccessary.
The way it was used in admintool (called after the objects of the xml parser were deleted)
causes a stack corruption, leading to crashes.


Modified: trunk/Administration/ExportDialog.cpp
===================================================================
--- trunk/Administration/ExportDialog.cpp	2011-06-29 10:08:27 UTC (rev 295)
+++ trunk/Administration/ExportDialog.cpp	2011-06-29 10:15:15 UTC (rev 296)
@@ -1130,7 +1130,7 @@
 
   doc->release();
 
-  XMLPlatformUtils::Terminate();
+  //XMLPlatformUtils::Terminate();
 
   //Show progress in status bar
   ((MainWindow*) GetParent())->SetStatusText(wxT("Progress of Export to XML file:  100%"));

Modified: trunk/Administration/ImportDialog.cpp
===================================================================
--- trunk/Administration/ImportDialog.cpp	2011-06-29 10:08:27 UTC (rev 295)
+++ trunk/Administration/ImportDialog.cpp	2011-06-29 10:15:15 UTC (rev 296)
@@ -423,7 +423,7 @@
     delete errHandler;
     delete xmlfile;
 
-    XMLPlatformUtils::Terminate();
+    //XMLPlatformUtils::Terminate();
 
     return DA_FAIL;
   }
@@ -457,7 +457,7 @@
     delete errHandler;
     delete xmlfile;
 
-    XMLPlatformUtils::Terminate();
+    //XMLPlatformUtils::Terminate();
 
     retval = DA_FAIL;
   }
@@ -483,7 +483,7 @@
     delete errHandler;
     delete xmlfile;
 
-    XMLPlatformUtils::Terminate();
+    //XMLPlatformUtils::Terminate();
 
     return DA_FAIL;
 
@@ -505,7 +505,7 @@
     delete errHandler;
     delete xmlfile;
 
-    XMLPlatformUtils::Terminate();
+    //XMLPlatformUtils::Terminate();
 
     return DA_FAIL;
   }
@@ -587,7 +587,7 @@
   delete xmlfile;
 
 
-  XMLPlatformUtils::Terminate();
+  //XMLPlatformUtils::Terminate();
 
   /*
   //