summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2016-09-11 16:49:09 +0200
committerMarkus Mittendrein <git@maxmitti.tk>2016-09-11 16:49:09 +0200
commit708a44a040c68b2b6e7e689441807b788cbe38fb (patch)
tree5a98f6ede47e83df2cdc8763a01836b1711030f7
parent5c32234ac93cad1c402edbf05dff363f5cbdc7c3 (diff)
downloadmanager-708a44a040c68b2b6e7e689441807b788cbe38fb.tar.gz
manager-708a44a040c68b2b6e7e689441807b788cbe38fb.zip
Move check if server should be set to admin to right place
-rw-r--r--src/crsm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp
index 7f9bfbd..ab88025 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -1584,6 +1584,11 @@ void CRSM::setIngameAdmin(const ClientInfo &client, const QString& newAdmin)
}
Session.Clonk.Admin = info;
}
+ else if(newAdmin == Config.Auto.Volatile.Clonk.ServerNick || newAdmin == Config.Auto.Volatile.Clonk.ServerPCName)
+ {
+ respond(client, "Der Server kann nicht als Rundenadmin eingetragen werden!\n");
+ return;
+ }
else
{
bool notFound = true, ambigous = false;
@@ -2343,11 +2348,6 @@ CMD_FUNCTION_IMPL(admin)
{
case Clonk:
interfaceAdminPtr = &Session.Clonk.Admin;
- if(args == Config.Auto.Volatile.Clonk.ServerNick || args == Config.Auto.Volatile.Clonk.ServerPCName)
- {
- respond(client, "Der Server kann nicht als Rundenadmin eingetragen werden!\n");
- return Success;
- }
break;
case IRC:
interfaceAdminPtr = &Session.IRC.Admin;