Compare commits

..

No commits in common. "df3defa890f7bae1a39cd0a8dcf120a82d6705e5" and "6e5c58069bf1b7a8d96f45b64f9a298e3a1b9a6f" have entirely different histories.

2 changed files with 2 additions and 3 deletions

View file

@ -316,7 +316,7 @@ void CardItem::drawAttachArrow()
for (const auto &item : scene()->selectedItems()) {
CardItem *card = qgraphicsitem_cast<CardItem *>(item);
if (card == nullptr || card == this) {
if (card == nullptr) {
continue;
}
if (card->getZone() != state->getZone()) {

View file

@ -138,8 +138,7 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
QPixmap bigPixmap;
if (QPixmapCache::find(key, &bigPixmap)) {
if (bigPixmap.isNull()) {
// Leave the pixmap null so callers fall back to a solid color
// instead of showing the card back.
getCardBackLoadingFailedPixmap(pixmap, size);
QDateTime failedAtTime = getInstance().failedAt.value(key);
if (!failedAtTime.isValid() ||
failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) {