blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

a crash fix on one of archive corner cases

Browse Source
This commit is contained in:
Blue 2022-04-17 16:25:15 +03:00
parent 8f949277f6
commit 4c20a314f0
Signed by: blue
GPG Key ID: 9B203B252A63EE38
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
### Bug fixes ### Bug fixes
- now when you remove an account it actually gets removed - now when you remove an account it actually gets removed
- segfault on unitialized Availability in some rare occesions - segfault on unitialized Availability in some rare occesions
- fixed crash when you open a dialog with someone that has only error messages in archive
### Improvements ### Improvements
- there is a way to disable an account and it wouldn't connect when you change availability - there is a way to disable an account and it wouldn't connect when you change availability

8
core/rosteritem.cpp
View File

@ -124,6 +124,7 @@ void Core::RosterItem::nextRequest()
if (requestedCount != -1) { if (requestedCount != -1) {
bool last = false; bool last = false;
if (archiveState == beginning || archiveState == complete) { if (archiveState == beginning || archiveState == complete) {
try {
QString firstId = archive->oldestId(); QString firstId = archive->oldestId();
if (responseCache.size() == 0) { if (responseCache.size() == 0) {
if (requestedBefore == firstId) { if (requestedBefore == firstId) {
@ -134,6 +135,9 @@ void Core::RosterItem::nextRequest()
last = true; last = true;
} }
} }
} catch (const Archive::Empty& e) {
last = true;
}
} else if (archiveState == empty && responseCache.size() == 0) { } else if (archiveState == empty && responseCache.size() == 0) {
last = true; last = true;
} }
@ -171,8 +175,12 @@ void Core::RosterItem::performRequest(int count, const QString& before)
requestCache.emplace_back(requestedCount, before); requestCache.emplace_back(requestedCount, before);
requestedCount = -1; requestedCount = -1;
} }
try {
Shared::Message msg = archive->newest(); Shared::Message msg = archive->newest();
emit needHistory("", getId(msg), msg.getTime()); emit needHistory("", getId(msg), msg.getTime());
} catch (const Archive::Empty& e) { //this can happen when the only message in archive is not server stored (error, for example)
emit needHistory(before, "");
}
} }
break; break;
case end: case end: