safer destruction of wxXmlResource::ms_instance

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index 649a55320da7f7c0da729ae7f707fb3cb1a3aa12..ade30b60395046eb4a00322f81af7f1908ca1fba 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -1112,7 +1112,7 @@ public:
     }
     void OnExit()
     {
-        delete wxXmlResource::Get();
+        delete wxXmlResource::Set(NULL);
         CleanXMLID_Records();
     }
 };

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 649a55320da7f7c0da729ae7f707fb3cb1a3aa12..ade30b60395046eb4a00322f81af7f1908ca1fba 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1112,7 +1112,7 @@ public:
     }
     void OnExit()
     {
-        delete wxXmlResource::Get();
+        delete wxXmlResource::Set(NULL);
         CleanXMLID_Records();
     }
 };