minus another clutch

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

3 files changed, 2 insertions, 15 deletions

diff --git a/plugins/Db3x_mmap/src/dbcache.cpp b/plugins/Db3x_mmap/src/dbcache.cpp
index 8fb1910caf..8862c7192f 100644
--- a/plugins/Db3x_mmap/src/dbcache.cpp
+++ b/plugins/Db3x_mmap/src/dbcache.cpp
@@ -23,18 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "commonheaders.h"

 

-int CDb3Mmap::Load(bool bSkipInit)

-{

-	int res = CDb3Base::Load(bSkipInit);

-	if (res != ERROR_SUCCESS)

-		return res;

-

-	if (!bSkipInit)

-		return InitCrypt();

-

-	return 0;

-}

-

 void CDb3Mmap::Map()

 {

 	m_hMap = CreateFileMapping(m_hDbFile, NULL, PAGE_READWRITE, 0, m_dwFileSize, NULL);

diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp
index c4b7732b9f..394904b8b2 100644
--- a/plugins/Db3x_mmap/src/dbintf.cpp
+++ b/plugins/Db3x_mmap/src/dbintf.cpp
@@ -123,8 +123,9 @@ int CDb3Base::Load(bool bSkipInit)
 	}

 

 	if ( !bSkipInit) {

-		if (InitCache()) return 1;

+		if (InitCache())       return 1;

 		if (InitModuleNames()) return 1;

+		if (InitCrypt())       return 1;

 

 		m_bReadOnly = false;

 

diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 9e8b04e549..7cf05536a2 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -297,8 +297,6 @@ struct CDb3Mmap : public CDb3Base
 	CDb3Mmap(const TCHAR* ptszFileName);

 	~CDb3Mmap();

 

-	int   Load(bool bSkipInit);

-

 protected:

 	virtual	DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact,DWORD ofsModuleName);

 	virtual	void  DBMoveChunk(DWORD ofsDest, DWORD ofsSource, int bytes);