jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-21 09:05:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[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

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-09-07 13:37:19 +02:00 • committed by GitHub
parent 030e4f5871
commit df3defa890
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
View file

@ -138,7 +138,8 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
QPixmap bigPixmap; QPixmap bigPixmap;
if (QPixmapCache::find(key, &bigPixmap)) { if (QPixmapCache::find(key, &bigPixmap)) {
if (bigPixmap.isNull()) { 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); QDateTime failedAtTime = getInstance().failedAt.value(key);
if (!failedAtTime.isValid() || if (!failedAtTime.isValid() ||
failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) { failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) {