File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -1362,8 +1362,6 @@ QgisApp::QgisApp()
1362
1362
1363
1363
QgisApp::~QgisApp ()
1364
1364
{
1365
- stopRendering ();
1366
-
1367
1365
delete mInternalClipboard ;
1368
1366
delete mQgisInterface ;
1369
1367
delete mStyleSheetBuilder ;
@@ -1452,6 +1450,12 @@ QgisApp::~QgisApp()
1452
1450
qDeleteAll ( mCustomDropHandlers );
1453
1451
qDeleteAll ( mCustomLayoutDropHandlers );
1454
1452
1453
+ const QList<QgsMapCanvas *> canvases = mapCanvases ();
1454
+ for ( QgsMapCanvas *canvas : canvases )
1455
+ {
1456
+ delete canvas;
1457
+ }
1458
+
1455
1459
// This function *MUST* be the last one called, as it destroys in
1456
1460
// particular GDAL. As above objects can hold GDAL/OGR objects, it is not
1457
1461
// safe destroying them afterwards
Original file line number Diff line number Diff line change @@ -211,6 +211,16 @@ QgsMapCanvas::~QgsMapCanvas()
211
211
delete mJob ;
212
212
}
213
213
214
+ QList< QgsMapRendererQImageJob * >::const_iterator previewJob = mPreviewJobs .constBegin ();
215
+ for ( ; previewJob != mPreviewJobs .constEnd (); ++previewJob )
216
+ {
217
+ if ( *previewJob )
218
+ {
219
+ whileBlocking ( *previewJob )->cancel ();
220
+ delete *previewJob;
221
+ }
222
+ }
223
+
214
224
// delete canvas items prior to deleting the canvas
215
225
// because they might try to update canvas when it's
216
226
// already being destructed, ends with segfault
You can’t perform that action at this time.
0 commit comments