Tighten scope of connection

nyalldawson · nyalldawson · commit dae93768314d · 2018-11-02T08:54:47.000+10:00
(cherry picked from commit c782f27)
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -140,7 +140,7 @@ QSqlDatabase QgsAuthManager::authDatabaseConnection() const
       // triggers a condition in QSqlDatabase which detects the nullptr private thread data and returns an invalid database instead.
       // QSqlDatabase::removeDatabase is thread safe, so this is ok to do.
       // Right about now is a good time to re-evaluate your selected career ;)
-      connect( QThread::currentThread(), &QThread::finished, this, [connectionName, this ]
+      connect( QThread::currentThread(), &QThread::finished, QThread::currentThread(), [connectionName, this ]
       {
         QMutexLocker locker( mMutex );
         QgsDebugMsgLevel( QStringLiteral( "Removing outdated connection to %1 on thread exit" ).arg( connectionName ), 2 );
diff --git a/src/providers/mssql/qgsmssqlconnection.cpp b/src/providers/mssql/qgsmssqlconnection.cpp
@@ -73,7 +73,7 @@ QSqlDatabase QgsMssqlConnection::getDatabase( const QString &service, const QStr
       // and a subsequent call to QSqlDatabase::database with the same thread address (yep it happens, actually a lot)
       // triggers a condition in QSqlDatabase which detects the nullptr private thread data and returns an invalid database instead.
       // QSqlDatabase::removeDatabase is thread safe, so this is ok to do.
-      QObject::connect( QThread::currentThread(), &QThread::finished, QCoreApplication::instance(), [connectionName]
+      QObject::connect( QThread::currentThread(), &QThread::finished, QThread::currentThread(), [connectionName]
       {
         QMutexLocker locker( &sMutex );
         QSqlDatabase::removeDatabase( connectionName );

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ QSqlDatabase QgsAuthManager::authDatabaseConnection() const`
`140`	`140`	`// triggers a condition in QSqlDatabase which detects the nullptr private thread data and returns an invalid database instead.`
`141`	`141`	`// QSqlDatabase::removeDatabase is thread safe, so this is ok to do.`
`142`	`142`	`// Right about now is a good time to re-evaluate your selected career ;)`
`143`		`- connect( QThread::currentThread(), &QThread::finished, this, [connectionName, this ]`
	`143`	`+ connect( QThread::currentThread(), &QThread::finished, QThread::currentThread(), [connectionName, this ]`
`144`	`144`	`{`
`145`	`145`	`QMutexLocker locker( mMutex );`
`146`	`146`	`QgsDebugMsgLevel( QStringLiteral( "Removing outdated connection to %1 on thread exit" ).arg( connectionName ), 2 );`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ QSqlDatabase QgsMssqlConnection::getDatabase( const QString &service, const QStr`
`73`	`73`	`// and a subsequent call to QSqlDatabase::database with the same thread address (yep it happens, actually a lot)`
`74`	`74`	`// triggers a condition in QSqlDatabase which detects the nullptr private thread data and returns an invalid database instead.`
`75`	`75`	`// QSqlDatabase::removeDatabase is thread safe, so this is ok to do.`
`76`		`- QObject::connect( QThread::currentThread(), &QThread::finished, QCoreApplication::instance(), [connectionName]`
	`76`	`+ QObject::connect( QThread::currentThread(), &QThread::finished, QThread::currentThread(), [connectionName]`
`77`	`77`	`{`
`78`	`78`	`QMutexLocker locker( &sMutex );`
`79`	`79`	`QSqlDatabase::removeDatabase( connectionName );`