sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup postgres column thread

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11501 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-08-25 20:45:13 +00:00
parent 20591bac19
commit ed00f883e1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/qgsdbsourceselect.cpp
View File

@ -211,6 +211,14 @@ void QgsDbSourceSelect::setLayerType( QString schema,
QgsDbSourceSelect::~QgsDbSourceSelect()
{
PQfinish( pd );
if ( mColumnTypeThread )
{
mColumnTypeThread->stop();
mColumnTypeThread->wait();
delete mColumnTypeThread;
mColumnTypeThread = NULL;
}
}
void QgsDbSourceSelect::populateConnectionList()
@ -844,7 +852,7 @@ void QgsGeomColumnTypeThread::getLayerTypes()
{
PQsetClientEncoding( pd, QString( "UNICODE" ).toLocal8Bit() );
for ( uint i = 0; i < schemas.size(); i++ )
for ( uint i = 0; i < schemas.size() && !mStopped; i++ )
{
QString query = QString( "select distinct "
"case"
@ -871,12 +879,10 @@ void QgsGeomColumnTypeThread::getLayerTypes()
}
PQclear( gresult );
if ( mStopped )
break;
// Now tell the layer list dialog box...
emit setLayerType( schemas[i], tables[i], columns[i], type );
}
}
PQfinish( pd );