Skip to content
Permalink
Browse files

Merge 7f69314 into cherry-pick-backport-9498-on-release-3_6-dc72722b-…

…2bd0-4bbf-8184-131756b522af
  • Loading branch information
backporting committed Mar 13, 2019
2 parents 513df7f + 7f69314 commit 188de5c1a824a1655425144b288797467d34db31
Showing with 12 additions and 1 deletion.
  1. +12 −1 src/app/qgisapp.cpp
@@ -540,7 +540,18 @@ static QgsMessageOutput *messageOutputViewer_()

static void customSrsValidation_( QgsCoordinateReferenceSystem &srs )
{
QgisApp::instance()->emitCustomCrsValidation( srs );
if ( QThread::currentThread() != QApplication::instance()->thread() )
{
// Running in a background thread -- we can't queue this connection, because
// srs is a reference and may be deleted before the queued slot is called.
// We also can't do ANY gui related stuff here. Best we can do is log
// a warning and move on...
QgsMessageLog::logMessage( QObject::tr( "Layer has unknown CRS" ) );
}
else
{
QgisApp::instance()->emitCustomCrsValidation( srs );
}
}

void QgisApp::emitCustomCrsValidation( QgsCoordinateReferenceSystem &srs )

0 comments on commit 188de5c

Please sign in to comment.
You can’t perform that action at this time.