Added missing header and missing logic. :)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 08:04:06 +00:00
parent a99966fb32
commit 016105291a
2 changed files with 11 additions and 8 deletions
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -281,10 +281,12 @@ wxDLManifestEntry::wxDLManifestEntry( const wxString &libname )

 wxDLManifestEntry::~wxDLManifestEntry()
 {
-    UnregisterModules();
-    RestoreClassInfo();
-
-    wxDllLoader::UnloadLibrary(m_handle);
+    if( m_handle != 0 )
+    {
+        UnregisterModules();
+        RestoreClassInfo();
+        wxDllLoader::UnloadLibrary(m_handle);
+    }
 }

 bool wxDLManifestEntry::UnrefLib()
@@ -460,7 +462,7 @@ wxDLManifestEntry *wxDynamicLibrary::Link(const wxString &libname)
        }
        else
        {
-            wxCHECK_MSG( !entry->UnrefLib(), 0,
+            wxCHECK_MSG( entry->UnrefLib(), 0,
                         _T("Currently linked library is, ..not loaded??") );
            entry = 0;
        }