X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=ed14be8ba9d785a86c715d8f8234f7e3476f8abf;hb=f9a73e3ad8142212028a39b26ced62456e575b7a;hp=6eccc9bc2b50f5979844eb54a3060e721f90c56a;hpb=6f0a153a674317d77233139fc50a2985af86e36e;p=quassel.git

diff --git a/src/common/network.cpp b/src/common/network.cpp
index 6eccc9bc..ed14be8b 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -122,14 +122,14 @@ void Network::setNetworkInfo(const NetworkInfo &info) {
   if(info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels);
 }
 
-QString Network::prefixToMode(const QString &prefix) {
+QString Network::prefixToMode(const QString &prefix) const {
   if(prefixes().contains(prefix))
     return QString(prefixModes()[prefixes().indexOf(prefix)]);
   else
     return QString();
 }
 
-QString Network::modeToPrefix(const QString &mode) {
+QString Network::modeToPrefix(const QString &mode) const {
   if(prefixModes().contains(mode))
     return QString(prefixes()[prefixModes().indexOf(mode)]);
   else
@@ -146,14 +146,14 @@ QStringList Network::nicks() const {
   return nicks;
 }
 
-QString Network::prefixes() {
+QString Network::prefixes() const {
   if(_prefixes.isNull())
     determinePrefixes();
 
   return _prefixes;
 }
 
-QString Network::prefixModes() {
+QString Network::prefixModes() const {
   if(_prefixModes.isNull())
     determinePrefixes();
 
@@ -732,7 +732,7 @@ void Network::emitConnectionError(const QString &errorMsg) {
 // ====================
 //  Private:
 // ====================
-void Network::determinePrefixes() {
+void Network::determinePrefixes() const {
   // seems like we have to construct them first
   QString prefix = support("PREFIX");
 
@@ -748,6 +748,9 @@ void Network::determinePrefixes() {
       _prefixModes = defaultPrefixModes;
       return;
     }
+    // clear the existing modes, just in case we're run multiple times
+    _prefixes = QString();
+    _prefixModes = QString();
 
     // we just assume that in PREFIX are only prefix chars stored
     for(int i = 0; i < defaultPrefixes.size(); i++) {