custom widgets: fix designer crash (fixes #32860)

(cherry picked from commit 7fdac2f)
qgis · Nov 18, 2019 · 8d5bbb7 · 8d5bbb7
1 parent b9611ee
commit 8d5bbb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ms-windows/osgeo4w/designer.bat.tmpl b/ms-windows/osgeo4w/designer.bat.tmpl
@@ -5,4 +5,5 @@ call py3_env.bat
 path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
 set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
 set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
+cd %USERPROFILE%
 start "Qt Designer with QGIS custom widgets" /B "%OSGEO4W_ROOT%\apps\qt5\bin\designer.exe" %*
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -128,7 +128,7 @@ QSqlDatabase QgsAuthManager::authDatabaseConnection() const
     authdb = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ), connectionName );
     authdb.setDatabaseName( authenticationDatabasePath() );
     // for background threads, remove database when current thread finishes
-    if ( QThread::currentThread() != QgsApplication::instance()->thread() )
+    if ( QThread::currentThread() != qApp->thread() )
     {
       QgsDebugMsgLevel( QStringLiteral( "Scheduled auth db remove on thread close" ), 2 );