Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxPluginLibrary unloading on failture (patch #962838)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-06 15:15:58 +00:00
parent 5385fa5b02
commit ebf0caa12b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/dynload.cpp
View File

@@ -120,7 +120,7 @@ bool wxPluginLibrary::UnrefLib()
wxASSERT_MSG( m_objcount == 0, wxASSERT_MSG( m_objcount == 0,
_T("Library unloaded before all objects were destroyed") ); _T("Library unloaded before all objects were destroyed") );
if ( --m_linkcount == 0 ) if ( m_linkcount == 0 || --m_linkcount == 0 )
{ {
delete this; delete this;
return TRUE; return TRUE;
@@ -148,6 +148,10 @@ void wxPluginLibrary::UpdateClasses()
void wxPluginLibrary::RestoreClasses() void wxPluginLibrary::RestoreClasses()
{ {
// Check if there is a need to restore classes.
if (!ms_classes)
return;
for(wxClassInfo *info = m_after; info != m_before; info = info->m_next) for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
{ {
ms_classes->erase(ms_classes->find(info->m_className)); ms_classes->erase(ms_classes->find(info->m_className));