From f0ac185f1fc99f64b49928c2886933ec927f265a Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 31 Dec 2008 00:49:00 +0100 Subject: [PATCH] removing debug output --- src/core/corebuffersyncer.cpp | 2 -- src/core/coresession.cpp | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/corebuffersyncer.cpp b/src/core/corebuffersyncer.cpp index f218508f..5f035a91 100644 --- a/src/core/corebuffersyncer.cpp +++ b/src/core/corebuffersyncer.cpp @@ -94,7 +94,6 @@ void CoreBufferSyncer::renameBuffer(BufferId bufferId, QString newName) { void CoreBufferSyncer::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2) { BufferInfo bufferInfo1 = Core::getBufferInfo(_coreSession->user(), bufferId1); BufferInfo bufferInfo2 = Core::getBufferInfo(_coreSession->user(), bufferId2); - qDebug() << Q_FUNC_INFO << bufferInfo1 << bufferInfo2; if(!bufferInfo1.isValid() || !bufferInfo2.isValid()) { qWarning() << "CoreBufferSyncer::mergeBufferPermanently(): invalid BufferIds:" << bufferId1 << bufferId2 << "for User:" << _coreSession->user(); return; @@ -106,7 +105,6 @@ void CoreBufferSyncer::mergeBuffersPermanently(BufferId bufferId1, BufferId buff } if(Core::mergeBuffersPermanently(_coreSession->user(), bufferId1, bufferId2)) { - qDebug () << "HUUUUP"; BufferSyncer::mergeBuffersPermanently(bufferId1, bufferId2); } } diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 90729811..557c9a83 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -382,7 +382,9 @@ void CoreSession::destroyNetwork(NetworkId id) { void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) { BufferInfo bufferInfo = Core::bufferInfo(user(), networkId, BufferInfo::QueryBuffer, oldName, false); - _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName); + if(bufferInfo.isValid()) { + _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName); + } } void CoreSession::clientsConnected() { -- 2.20.1