summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-07-09 17:12:50 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-07-09 17:12:50 +0300
commit8a8d613373dc5a54dcf84025d53f5de4a8c4964f (patch)
tree5e4dba57f2d82d74208bb218e3c2f1f18b2d8276 /plugins
parente7dc76ddb8785bbf26f0aaecac7d0f8af8a57db0 (diff)
fixes #2474 (NewStory: системная история не удаляется)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Dbx_mdbx/src/dbintf.cpp2
-rw-r--r--plugins/NewStory/src/history_control.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp
index 6822eda603..8a28dfe589 100644
--- a/plugins/Dbx_mdbx/src/dbintf.cpp
+++ b/plugins/Dbx_mdbx/src/dbintf.cpp
@@ -33,6 +33,8 @@ CDbxMDBX::CDbxMDBX(const TCHAR *tszFileName, int iMode) :
m_maxContactId(0),
m_impl(*this)
{
+ m_ccDummy.nSubs = -1;
+
m_tszProfileName = mir_wstrdup(tszFileName);
}
diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index 3fe1f06589..f9ef9c88a8 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -618,7 +618,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
int eventCount = data->items.getCount();
for (int i = eventCount - 1; i >= 0; i--) {
auto *p = data->items.get(i, false);
- if (p->hEvent && p->hContact)
+ if (p->hEvent)
db_event_delete(p->hEvent);
}
db_set_safety_mode(true);