gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Refactor-settings

Browse Source 
Conflicts:
	oracle/CMakeLists.txt
This commit is contained in:
marco
2015-09-01 21:28:53 +02:00
parent 0b94b47f72 0a9057d1b8
commit baa61d0571
330 changed files with 37514 additions and 13448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servatrice/src/serversocketinterface.cpp
+1 -1
View File
@@ -777,7 +777,7 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban
userList.append(user);
}
if (userName.isEmpty() && address.isEmpty()) {
if (userName.isEmpty() && address.isEmpty() && (!QString::fromStdString(cmd.clientid()).isEmpty())) {
QSqlQuery *query = sqlInterface->prepareQuery("select name from {prefix}_users where clientid = :client_id");
query->bindValue(":client_id", QString::fromStdString(cmd.clientid()));
sqlInterface->execSqlQuery(query);