summaryrefslogtreecommitdiff
path: root/plugins/Dbx_mdb/src/dbcontacts.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Dbx_mdb/src/dbcontacts.cpp')
-rw-r--r--plugins/Dbx_mdb/src/dbcontacts.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/Dbx_mdb/src/dbcontacts.cpp b/plugins/Dbx_mdb/src/dbcontacts.cpp
index 411f93140f..e2c67c3981 100644
--- a/plugins/Dbx_mdb/src/dbcontacts.cpp
+++ b/plugins/Dbx_mdb/src/dbcontacts.cpp
@@ -219,7 +219,9 @@ void CDbxMdb::GatherContactHistory(MCONTACT hContact, LIST<EventItem> &list)
BOOL CDbxMdb::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
{
- LIST<EventItem> list(10000);
+ mir_cslock lck(m_csDbAccess);
+
+ LIST<EventItem> list(1000);
GatherContactHistory(ccSub->contactID, list);
for (int i = 0; i < list.getCount(); i++) {
@@ -254,7 +256,9 @@ BOOL CDbxMdb::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
BOOL CDbxMdb::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
{
- LIST<EventItem> list(10000);
+ mir_cslock lck(m_csDbAccess);
+
+ LIST<EventItem> list(1000);
GatherContactHistory(ccSub->contactID, list);
for (int i = 0; i < list.getCount(); i++) {