lMuuids delenda est

git-svn-id: http://svn.miranda-ng.org/main/trunk@292 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 7 insertions, 9 deletions

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index a0b6582d1c..c8d173f9a7 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -134,7 +134,7 @@ void UnloadClcModule(void);
 void UnloadContactListModule(void);

 void UnloadEventsModule(void);

 void UnloadIdleModule(void);

-void UnloadLangPackModule(bool);

+void UnloadLangPackModule(void);

 void UnloadSslModule(void);

 void UnloadNetlibModule(void);

 void UnloadNewPlugins(void);

@@ -236,7 +236,7 @@ void UnloadDefaultModules(void)
 	UnloadUpdateNotifyModule();

 	UnloadNetlibModule();

 	UnloadSslModule();

-	UnloadLangPackModule(true);

+	UnloadLangPackModule();

 }

 

 int InitialiseModularEngine(void)

diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp
index 01dd16365d..cec6511386 100644
--- a/src/modules/langpack/langpack.cpp
+++ b/src/modules/langpack/langpack.cpp
@@ -537,16 +537,14 @@ int LoadLangPackModule(void)
 	return 0;

 }

 

-void UnloadLangPackModule(bool bRemoveAll)

+void UnloadLangPackModule()

 {

 	if ( !bModuleInitialized ) return;

 

 	int i;

-	if ( bRemoveAll ) {

-		for ( i=0; i < lMuuids.getCount(); i++ )

-			mir_free( lMuuids[i] );

-		lMuuids.destroy();

-	}

+	for ( i=0; i < lMuuids.getCount(); i++ )

+		mir_free( lMuuids[i] );

+	lMuuids.destroy();

 

 	LangPackEntry* p = langPack.entry;

 	for ( i=0; i < langPack.entryCount; i++, p++ ) {

@@ -576,7 +574,7 @@ INT_PTR ReloadLangpack(WPARAM wParam, LPARAM lParam)
 	if ( pszStr == NULL )

 		pszStr = langPack.filename;

 

-	UnloadLangPackModule(false);

+	UnloadLangPackModule();

 	LoadLangPack(pszStr);

 	return 0;

 }