projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
windows buildsystem fix
[quassel.git]
/
src
/
uisupport
/
abstractbuffercontainer.cpp
diff --git
a/src/uisupport/abstractbuffercontainer.cpp
b/src/uisupport/abstractbuffercontainer.cpp
index
1444027
..
f3ffbf8
100644
(file)
--- a/
src/uisupport/abstractbuffercontainer.cpp
+++ b/
src/uisupport/abstractbuffercontainer.cpp
@@
-23,13
+23,13
@@
#include "client.h"
#include "networkmodel.h"
#include "client.h"
#include "networkmodel.h"
-AbstractBufferContainer::AbstractBufferContainer(QWidget *parent) : AbstractItemView(parent), _currentBuffer(0)
+AbstractBufferContainer::AbstractBufferContainer(QWidget *parent)
+ : AbstractItemView(parent),
+ _currentBuffer(0)
{
{
-
}
AbstractBufferContainer::~AbstractBufferContainer() {
}
AbstractBufferContainer::~AbstractBufferContainer() {
-
}
}
@@
-78,19
+78,18
@@
void AbstractBufferContainer::currentChanged(const QModelIndex ¤t, const Q
}
void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
}
void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
- if(!bufferId.isValid()) {
- showChatView(0);
- return;
- }
-
AbstractChatView *chatView = 0;
AbstractChatView *chatView = 0;
- Buffer *buf = Client::buffer(bufferId);
- if(!buf) {
- qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
- return;
- }
Buffer *prevBuffer = Client::buffer(currentBuffer());
if(prevBuffer) prevBuffer->setVisible(false);
Buffer *prevBuffer = Client::buffer(currentBuffer());
if(prevBuffer) prevBuffer->setVisible(false);
+
+ Buffer *buf;
+ if(!bufferId.isValid() || !(buf = Client::buffer(bufferId))) {
+ if(bufferId.isValid())
+ qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
+ _currentBuffer = 0;
+ showChatView(0);
+ return;
+ }
if(_chatViews.contains(bufferId)) {
chatView = _chatViews[bufferId];
} else {
if(_chatViews.contains(bufferId)) {
chatView = _chatViews[bufferId];
} else {