diff options
author | George Hazan <george.hazan@gmail.com> | 2014-02-25 19:51:01 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-02-25 19:51:01 +0000 |
commit | d84c40216b5e60224eb365f633b5f142d459fc9e (patch) | |
tree | c64402a3813b8c452f8bb80bb9c13bf5b6529e18 /plugins/Db3x_mmap/src/dbintf.cpp | |
parent | f8ad8c89b9b308a79ad1f4081a478338eb504c26 (diff) |
merge from branch
git-svn-id: http://svn.miranda-ng.org/main/trunk@8274 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db3x_mmap/src/dbintf.cpp')
-rw-r--r-- | plugins/Db3x_mmap/src/dbintf.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index 2a6b3be65c..d481fd1afa 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -135,10 +135,19 @@ int CDb3Mmap::Load(bool bSkipInit) // everything is ok, go on
if (!m_bReadOnly) {
+ bool bConversion = false;
if (m_dbHeader.version < DB_095_VERSION) {
ConvertContacts();
+ bConversion = true;
+ }
+
+ if (m_dbHeader.version < DB_095_1_VERSION) {
+ ConvertEvents();
+ bConversion = true;
+ }
- m_dbHeader.version = DB_095_VERSION;
+ if (bConversion) {
+ m_dbHeader.version = DB_095_1_VERSION;
DBWrite(sizeof(dbSignatureU), &m_dbHeader.version, sizeof(m_dbHeader.version));
}
|