X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1706592402b755f42e86a31811750b893c1b1a2..9d155f504e4e39b5cba44729185506805867f9fd:/src/common/dynload.cpp?ds=sidebyside diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index c1e35efc79..3b2ff4bf0e 100644 --- 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; }