m_operjoin Remove duplicated code

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / capab.cpp

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index f4f1e1ace0337681977102d75a12e8aa2a672cdc..c52dffa4124d1f29a85365b1a0d0e3a6524d18e0 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -59,16 +59,18 @@ static std::string BuildModeList(ModeType type)
                {
                        std::string mdesc = mh->name;
                        mdesc.push_back('=');
-                       if (mh->GetPrefix())
-                               mdesc.push_back(mh->GetPrefix());
-                       if (mh->GetModeChar())
-                               mdesc.push_back(mh->GetModeChar());
+                       PrefixMode* pm = mh->IsPrefixMode();
+                       if (pm)
+                       {
+                               if (pm->GetPrefix())
+                                       mdesc.push_back(pm->GetPrefix());
+                       }
+                       mdesc.push_back(mh->GetModeChar());
                        modes.push_back(mdesc);
                }
        }
        sort(modes.begin(), modes.end());
-       irc::stringjoiner line(modes);
-       return line.GetJoined();
+       return irc::stringjoiner(modes);
 }
 
 void TreeSocket::SendCapabilities(int phase)
@@ -385,4 +387,3 @@ bool TreeSocket::Capab(const parameterlist &params)
        }
        return true;
 }
-