diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-08-11 18:58:20 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-08-11 18:58:23 +0300 |
| commit | 22319c1510762771dd0399118ed048ca993d04c6 (patch) | |
| tree | b53364bde91575600cfd755743f4598ba96f3e5e /src | |
| parent | 40f612ff8265906991ef40500f91c4112275b44b (diff) | |
fixes #3634 (tabSRMM заставляет прощёлкать каждое непрочитанное сообщение)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/chat_log.cpp | 7 | ||||
| -rw-r--r-- | src/mir_app/src/clistevents.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_log_rtf.cpp | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp index 5891173849..9cefd759de 100644 --- a/src/mir_app/src/chat_log.cpp +++ b/src/mir_app/src/chat_log.cpp @@ -318,11 +318,10 @@ void CRtfLogWindow::CreateChatRtfMessage(RtfChatLogStreamData *streamData, const if (lin.hEvent) {
DB::EventInfo dbei(lin.hEvent);
if (dbei) {
- if (!dbei.markedRead()) {
- if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_FILE || dbei.isSrmm()) {
+ if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_FILE || dbei.isSrmm()) {
+ if (!dbei.markedRead())
db_event_markRead(si->hContact, lin.hEvent);
- Clist_RemoveEvent(si->hContact, lin.hEvent);
- }
+ Clist_RemoveEvent(-1, lin.hEvent);
}
if (dbei.eventType == EVENTTYPE_FILE) {
diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp index a6f391e950..bf66ff771f 100644 --- a/src/mir_app/src/clistevents.cpp +++ b/src/mir_app/src/clistevents.cpp @@ -378,7 +378,7 @@ MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index) static int CListEventMarkedRead(WPARAM, LPARAM hDbEvent)
{
- Clist_RemoveEvent(INVALID_CONTACT_ID, hDbEvent);
+ Clist_RemoveEvent(-1, hDbEvent);
return 0;
}
diff --git a/src/mir_app/src/srmm_log_rtf.cpp b/src/mir_app/src/srmm_log_rtf.cpp index 7ad3fb4659..83d6166e27 100644 --- a/src/mir_app/src/srmm_log_rtf.cpp +++ b/src/mir_app/src/srmm_log_rtf.cpp @@ -323,8 +323,9 @@ static bool CreateRtfFromDbEvent(RtfLogStreamData *dat) return false;
if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || dbei.isSrmm())) {
- db_event_markRead(dat->hContact, dat->hDbEvent);
- Clist_RemoveEvent(dat->hContact, dat->hDbEvent);
+ if (!dbei.markedRead())
+ db_event_markRead(dat->hContact, dat->hDbEvent);
+ Clist_RemoveEvent(-1, dat->hDbEvent);
}
else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {
db_event_markRead(dat->hContact, dat->hDbEvent);
|