projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing the creating of new buffers in the client. bye bye Client::buffer(BufferId)
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
7cf25c1
..
48c471c
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-160,15
+160,10
@@
Buffer *Client::statusBuffer(const NetworkId &networkId) const {
return 0;
}
return 0;
}
-Buffer *Client::buffer(BufferId bufferId) {
- if(instance()->_buffers.contains(bufferId))
- return instance()->_buffers[bufferId];
- else
- return 0;
-}
-
Buffer *Client::buffer(BufferInfo bufferInfo) {
Buffer *Client::buffer(BufferInfo bufferInfo) {
- Buffer *buff = buffer(bufferInfo.bufferId());
+ Buffer *buff = 0;
+ if(instance()->_buffers.contains(bufferInfo.bufferId()))
+ buff = instance()->_buffers[bufferInfo.bufferId()];
if(!buff) {
Client *client = Client::instance();
if(!buff) {
Client *client = Client::instance();