Merging r732:745 from trunk into branches/0.3. Forwardporting fancy bufferviews and...

[quassel.git] / src / common / bufferviewconfig.cpp

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index 2ffb3a7..1affaba 100644 (file)
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -129,26 +129,32 @@ void BufferViewConfig::initSetBufferList(const QList<BufferId> &buffers) {
 }
 
 void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
-  qDebug() << "addBuffer" << bufferId;
   if(_buffers.contains(bufferId))
     return;
+
+  if(pos < 0)
+    pos = 0;
+  if(pos > _buffers.count())
+    pos = _buffers.count();
   
   _buffers.insert(pos, bufferId);
   emit bufferAdded(bufferId, pos);
 }
 
 void BufferViewConfig::moveBuffer(const BufferId &bufferId, int pos) {
-  qDebug() << "moveeBuffer" << bufferId;
   if(!_buffers.contains(bufferId))
     return;
 
-  qDebug() << "lala" << bufferId << pos;
+  if(pos < 0)
+    pos = 0;
+  if(pos >= _buffers.count())
+    pos = _buffers.count() - 1;
+
   _buffers.move(_buffers.indexOf(bufferId), pos);
   emit bufferMoved(bufferId, pos);
 }
 
 void BufferViewConfig::removeBuffer(const BufferId &bufferId) {
-  qDebug() << "removeBuffer" << bufferId;
   if(!_buffers.contains(bufferId))
     return;