[PictureLoader] Leave failed pixmap null so solid color is shown instead. (#7274 )

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
[Game] Stop duplicate attach log entries (#7273 )
2026-09-28 08:52:19 -07:00 · 2026-09-07 13:37:19 +02:00 · 2026-09-07 13:37:13 +02:00
2 changed files with 3 additions and 2 deletions
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@ -316,7 +316,7 @@ void CardItem::drawAttachArrow()
    for (const auto &item : scene()->selectedItems()) {
        CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (card == nullptr) {
+        if (card == nullptr || card == this) {
            continue;
        }
        if (card->getZone() != state->getZone()) {
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@ -138,7 +138,8 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
    QPixmap bigPixmap;
    if (QPixmapCache::find(key, &bigPixmap)) {
        if (bigPixmap.isNull()) {
-            getCardBackLoadingFailedPixmap(pixmap, size);
+            // Leave the pixmap null so callers fall back to a solid color
            // instead of showing the card back.
            QDateTime failedAtTime = getInstance().failedAt.value(key);
            if (!failedAtTime.isValid() ||
                failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) {
Author	SHA1	Message	Date
BruebachL	df3defa890	[PictureLoader] Leave failed pixmap null so solid color is shown instead. (#7274 ) Some checks are pending CodeQL / Analyze (cpp) (push) Waiting to run Details CodeQL / Analyze (actions) (push) Waiting to run Details Build Desktop / Configure (push) Waiting to run Details Build Desktop / Debian 13 (push) Blocked by required conditions Details Build Desktop / Debian 12 (push) Blocked by required conditions Details Build Desktop / Fedora 44 (push) Blocked by required conditions Details Build Desktop / Fedora 43 (push) Blocked by required conditions Details Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions Details Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions Details Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions Details Build Desktop / Arch (push) Blocked by required conditions Details Build Desktop / macOS 13 Intel (push) Blocked by required conditions Details Build Desktop / macOS 14 (push) Blocked by required conditions Details Build Desktop / macOS 15 (push) Blocked by required conditions Details Build Desktop / macOS 26 Debug (push) Blocked by required conditions Details Build Desktop / Windows 10 (push) Blocked by required conditions Details Build Docker / Servatrice (arm) (push) Waiting to run Details Build Docker / Servatrice (x86) (push) Waiting to run Details Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions Details Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2026-09-07 13:37:19 +02:00
BruebachL	030e4f5871	[Game] Stop duplicate attach log entries (#7273 ) Fix duplicate attach messages in the game log caused by a redundant child arrow in CardItem::drawAttachArrow. Unlike the sibling drawArrow, drawAttachArrow omitted the ``card == this`` guard when iterating selectedItems(). Because right-clicking a card to open the attach menu selects that card, it was always present in selectedItems(), producing a second arrow for the same source card. On release both arrows sent an identical Command_AttachCard, so the server broadcast two Event_AttachCard messages and the log rendered "attaches to" twice. Mirror the drawArrow skip condition so the active card is excluded and only one attach command is sent. Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2026-09-07 13:37:13 +02:00