aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_channel.cpp6
-rw-r--r--src/kvirc/ui/kvi_window.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index a582a3035..7ca800883 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1843,11 +1843,11 @@ void KviChannel::preprocessMessage(QString & szMessage)
QStringList strings = szMessage.split(" ",QString::KeepEmptyParts);
for(QStringList::Iterator it = strings.begin(); it != strings.end(); ++it)
{
- QString szTmp = KviMircCntrl::stripControlBytes(*it).trimmed();
- if(szTmp.length() < 1)
+ if(it->contains('\r'))
continue;
- if(szTmp.contains('\r'))
+ QString szTmp = KviMircCntrl::stripControlBytes(*it).trimmed();
+ if(szTmp.length() < 1)
continue;
// FIXME: Do we REALLY need this ?
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 46c5b76f5..c9d9134a6 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1345,12 +1345,12 @@ void KviWindow::preprocessMessage(QString & szMessage)
QStringList strings = szMessage.split(" ");
for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it )
{
+ if(it->contains('\r'))
+ continue;
QString tmp(*it);
tmp = KviMircCntrl::stripControlBytes(tmp).trimmed();
if(tmp.length() < 1)
continue;
- if(tmp.contains('\r'))
- return;
if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0]))
{
if((*it)==tmp)