From 085b3da8e09f2793a0acc83448a1731fd1c8853a Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 17 Jul 2024 12:57:05 +0200 Subject: [PATCH] Fixed some potential crashes when encountering scraper errors --- es-app/src/guis/GuiScraperSearch.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/es-app/src/guis/GuiScraperSearch.cpp b/es-app/src/guis/GuiScraperSearch.cpp index b007c9d6f..abc68779d 100644 --- a/es-app/src/guis/GuiScraperSearch.cpp +++ b/es-app/src/guis/GuiScraperSearch.cpp @@ -865,7 +865,8 @@ void GuiScraperSearch::update(int deltaTime) } else if (mMDRetrieveURLsHandle->status() == ASYNC_ERROR) { onSearchError(mMDRetrieveURLsHandle->getStatusString(), - mMDRetrieveURLsHandle->getRetry(), mSearchHandle->getFatalError()); + mMDRetrieveURLsHandle->getRetry(), + (mSearchHandle != nullptr ? mSearchHandle->getFatalError() : false)); mMDRetrieveURLsHandle.reset(); } } @@ -923,7 +924,7 @@ void GuiScraperSearch::update(int deltaTime) } else if (mMDResolveHandle->status() == ASYNC_ERROR) { onSearchError(mMDResolveHandle->getStatusString(), mMDResolveHandle->getRetry(), - mSearchHandle->getFatalError()); + (mSearchHandle != nullptr ? mSearchHandle->getFatalError() : false)); mMDResolveHandle.reset(); } } @@ -952,7 +953,8 @@ void GuiScraperSearch::updateThumbnail() else { mResultThumbnail->setImage(""); onSearchError("Error downloading thumbnail:\n " + it->second->getErrorMsg(), true, - mSearchHandle->getFatalError(), it->second->status()); + (mSearchHandle != nullptr ? mSearchHandle->getFatalError() : false), + it->second->status()); } mThumbnailReqMap.erase(it);