Skip to content

[Backport release-4_1] Truly fix the legend image fetcher crash #7278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nirvn merged 1 commit into from
Apr 6, 2026
+16 −8
Merged

[Backport release-4_1] Truly fix the legend image fetcher crash #7278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/core/legendimageprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ QQuickImageResponse *AsyncLegendImageProvider::requestImageResponse( const QStri
{
mapSettings = mMapSettings->mapSettings();
}
AsyncLegendImageResponse *response = new AsyncLegendImageResponse( rasterLayer->dataProvider()->clone(), mMapSettings ? &mapSettings : nullptr );
AsyncLegendImageResponse *response = new AsyncLegendImageResponse( rasterLayer->dataProvider(), mMapSettings ? &mapSettings : nullptr );
return response;
}
}
Expand All @@ -180,16 +180,15 @@ QQuickImageResponse *AsyncLegendImageProvider::requestImageResponse( const QStri


AsyncLegendImageResponse::AsyncLegendImageResponse( QgsRasterDataProvider *dataProvider, const QgsMapSettings *mapSettings )
: mDataProvider( dataProvider )
: mDataProvider( dataProvider->clone() )
{
if ( dataProvider )
if ( mDataProvider )
{
mFetcher.reset( mDataProvider->getLegendGraphicFetcher( mapSettings ) );
mFetcher = mDataProvider->getLegendGraphicFetcher( mapSettings );
if ( mFetcher )
{
mFetcher->setParent( nullptr );
connect( mFetcher.get(), &QgsImageFetcher::finish, this, &AsyncLegendImageResponse::handleFinish );
connect( mFetcher.get(), &QgsImageFetcher::error, this, &AsyncLegendImageResponse::handleError );
connect( mFetcher, &QgsImageFetcher::finish, this, &AsyncLegendImageResponse::handleFinish );
connect( mFetcher, &QgsImageFetcher::error, this, &AsyncLegendImageResponse::handleError );
mFetcher->start();
return;
}
Expand All @@ -199,6 +198,14 @@ AsyncLegendImageResponse::AsyncLegendImageResponse( QgsRasterDataProvider *dataP
emit finished();
}

AsyncLegendImageResponse::~AsyncLegendImageResponse()
{
if ( mFetcher )
{
mFetcher->deleteLater();
}
}

void AsyncLegendImageResponse::handleFinish( const QImage &image )
{
if ( !mFetcher )
Expand Down
3 changes: 2 additions & 1 deletion src/core/legendimageprovider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class AsyncLegendImageResponse : public QQuickImageResponse
{
public:
AsyncLegendImageResponse( QgsRasterDataProvider *dataProvider = nullptr, const QgsMapSettings *mapSettings = nullptr );
~AsyncLegendImageResponse();

QQuickTextureFactory *textureFactory() const override;

Expand All @@ -62,7 +63,7 @@ class AsyncLegendImageResponse : public QQuickImageResponse

private:
std::unique_ptr<QgsRasterDataProvider> mDataProvider;
QObjectUniquePtr<QgsImageFetcher> mFetcher = nullptr;
QPointer<QgsImageFetcher> mFetcher;

QImage mImage;
};
Expand Down
Loading