diff options
| author |  Fabio Bas | 2010-12-21 23:01:21 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-12-21 23:01:21 +0000 |
| commit | fb9414e1ca6f0425f73fcdae9f0e0da8ebd09cbb (patch) | |
| tree | a78cfb6bb77a8bc2f97d31026bf668a0a1d036e7 | |
| parent | support both u2 and ratbox version of numeric 338 (diff) | |
| download | KVIrc-fb9414e1ca6f0425f73fcdae9f0e0da8ebd09cbb.tar.gz KVIrc-fb9414e1ca6f0425f73fcdae9f0e0da8ebd09cbb.tar.bz2 KVIrc-fb9414e1ca6f0425f73fcdae9f0e0da8ebd09cbb.zip | |
fixed mode links: in some cases the prepocessor was recognizing eg. "+s" as a channels name and inserting a channel link inside the mode link, breaking the generated ircview line (thx egns for noticing)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5218 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/ui/kvi_channel.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_window.cpp | 4 |
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) |