diff options
Diffstat (limited to 'plugins/MirandaG15')
| -rw-r--r-- | plugins/MirandaG15/src/CChatScreen.cpp | 11 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/CContactList.cpp | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/MirandaG15/src/CChatScreen.cpp b/plugins/MirandaG15/src/CChatScreen.cpp index 875331a02d..f519baaae8 100644 --- a/plugins/MirandaG15/src/CChatScreen.cpp +++ b/plugins/MirandaG15/src/CChatScreen.cpp @@ -314,18 +314,18 @@ void CChatScreen::LoadHistory() LHandles.push_front(hEvent);
if(CConfig::GetBoolSetting(SESSION_LOADDB) && *(LHandles.begin()) == hUnread)
break;
- hEvent = db_event_prev(hEvent);
+ hEvent = db_event_prev(m_hContact, hEvent);
}
}
else
{
for (int i = CConfig::GetIntSetting(SESSION_LOGSIZE); i > 0 && hEvent!=NULL; i--)
{
- LHandles.push_front(hEvent);
- hEvent = db_event_prev(hEvent);
+ LHandles.push_front(hEvent);
+ hEvent = db_event_prev(m_hContact, hEvent);
}
}
-
+
bool bRead = true;
while(!(LHandles.empty()))
{
@@ -361,7 +361,8 @@ bool CChatScreen::Update() if(!m_bCloseTimer && CConfig::GetIntSetting(SESSION_CLOSETIMER) != 0) {
m_bCloseTimer = true;
m_dwCloseTimer = GetTickCount();
- } else if(CConfig::GetIntSetting(SESSION_CLOSETIMER) == 0 || GetTickCount() - m_dwCloseTimer >= CConfig::GetIntSetting(SESSION_CLOSETIMER)) {
+ }
+ else if(CConfig::GetIntSetting(SESSION_CLOSETIMER) == 0 || GetTickCount() - m_dwCloseTimer >= CConfig::GetIntSetting(SESSION_CLOSETIMER)) {
m_bCloseTimer = false;
CAppletManager::GetInstance()->ActivateEventScreen();
return true;
diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index fad2ae47a5..904090ddd8 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -929,7 +929,7 @@ void CContactList::UpdateMessageCounter(CListEntry<CContactListEntry*,CContactLi pEntry->iMessages++;
if(hLastEvent == hEvent)
break;
- hLastEvent = db_event_prev(hLastEvent);
+ hLastEvent = db_event_prev(pEntry->hHandle, hLastEvent);
}
}
if(pEntry->iMessages >= 100)
|