projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing issues with hidden virtual methods
[quassel.git]
/
src
/
client
/
clientbacklogmanager.cpp
diff --git
a/src/client/clientbacklogmanager.cpp
b/src/client/clientbacklogmanager.cpp
index
f88c606
..
2b2c586
100644
(file)
--- a/
src/client/clientbacklogmanager.cpp
+++ b/
src/client/clientbacklogmanager.cpp
@@
-90,7
+90,7
@@
void ClientBacklogManager::requestInitialBacklog() {
_requester = new FixedBacklogRequester(this);
};
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->request
Initial
Backlog();
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
@@
-107,7
+107,11
@@
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &buffer
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
- Q_ASSERT(_requester);
+ if(!_requester) {
+ // during client start up this message is to be expected in some situations.
+ qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester (yet?).";
+ return;
+ }
switch(_requester->type()) {
case BacklogRequester::GlobalUnread:
break;
switch(_requester->type()) {
case BacklogRequester::GlobalUnread:
break;