From bb56947128bda7c1936370685f3d7c0c3a3c68e7 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sun, 25 Jan 2026 19:07:27 +0100 Subject: [PATCH] handle failure with normal failure handler --- .../card_picture_loader_worker_work.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp index 957c74e32..cd41ac27f 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp @@ -70,6 +70,7 @@ void CardPictureLoaderWorkerWork::picDownloadFailed() void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply) { QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); + bool redirectFailure = false; if (redirectTarget.isValid()) { QUrl url = reply->request().url(); QUrl redirectUrl = redirectTarget.toUrl(); @@ -78,16 +79,13 @@ void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply) } if (url == redirectUrl) { qCWarning(CardPictureLoaderWorkerWorkLog) << "recusive redirect detected!"; - qCWarning(CardPictureLoaderWorkerWorkLog) << "refusing to load" << redirectTarget; - reply->deleteLater(); - picDownloadFailed(); - return; + redirectFailure = true; } else { emit urlRedirected(url, redirectUrl); } } - if (reply->error()) { + if (redirectFailure || reply->error()) { handleFailedReply(reply); } else { handleSuccessfulReply(reply);