From 614b63617676095447020c5c488fd2deba1e0ab1 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sat, 21 Jun 2025 23:01:10 -0700 Subject: [PATCH] Remove redundant startNextPicDownload --- .../ui/picture_loader/picture_loader_worker_work.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp index fbc7bdb5d..c47aa3ad4 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp @@ -57,6 +57,10 @@ void PictureLoaderWorkerWork::startNextPicDownload() } } +/** + * Starts another pic download using the next possible url combination for the card. + * If all possibilities are exhausted, then concludes the image loading with an empty QImage. + */ void PictureLoaderWorkerWork::picDownloadFailed() { /* Take advantage of short-circuiting here to call the nextUrl until one @@ -96,7 +100,6 @@ void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply) << " failed for url " << reply->url().toDisplayString() << " (" << reply->errorString() << ")"; picDownloadFailed(); - startNextPicDownload(); } reply->deleteLater(); @@ -128,7 +131,6 @@ void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply) picDownloadFailed(); reply->deleteLater(); - startNextPicDownload(); return; } @@ -170,8 +172,6 @@ void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply) << "PictureLoader: [card: " << cardToDownload.getCard()->getName() << " set: " << cardToDownload.getSetName() << "]: Image successfully " << (isFromCache ? "loaded from cached" : "downloaded from") << " url " << reply->url().toDisplayString(); - } else { - startNextPicDownload(); } reply->deleteLater();