Support logging config on install

cockatrice/CMakeLists.txt

@@ -373,10 +373,10 @@ if(WIN32)
   )
 
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
-    DESTINATION ./
-    FILES_MATCHING
-    PATTERN "*.ini"
+      DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+      DESTINATION ./
+      FILES_MATCHING
+      PATTERN "*.ini"
   )
 
   # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)

cockatrice/src/main.cpp

@@ -190,10 +190,8 @@ int main(int argc, char *argv[])
     const QByteArray configPath = "";
 #endif
 
-    if (!qEnvironmentVariableIsSet(("QT_LOGGING_CONF"))) {
-        // Set the QT_LOGGING_CONF environment variable
-        qputenv("QT_LOGGING_CONF", configPath);
-    }
+    // Set the QT_LOGGING_CONF environment variable
+    qputenv("QT_LOGGING_CONF", configPath);
     qSetMessagePattern(
         "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
         "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"

common/server_player.cpp

@@ -895,12 +895,9 @@ Server_Player::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /
             continue;
         }
 
-        const QString cardAnnotation = card->getAnnotation();
-        if (!cardAnnotation.isEmpty()) {
-            const auto &regexResult = ownerRegex.match(cardAnnotation);
-            if (!regexResult.hasMatch()) {
-                continue;
-            }
+        const auto &regexResult = ownerRegex.match(card->getAnnotation());
+        if (!regexResult.hasMatch()) {
+            continue;
         }
 
         CardToMove cardToMove;