Skip to content

Commit e4d1bc8

Browse files
author
g_j_m
committedOct 13, 2006
Fix problem where the user copy of the qgis.db database wasn't being
copied into the correct place because some other part of qgis had the file open, preventing copying of it. The copy is now done sooner in qgis's startup process to avoid this problem. git-svn-id: http://svn.osgeo.org/qgis/trunk@5944 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 333f979 commit e4d1bc8

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed
 

‎src/gui/qgisapp.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,13 @@ static void setTitleBarText_( QWidget & qgisApp )
214214
: QMainWindow(parent,fl),
215215
mSplash(splash)
216216
{
217-
218217
setupUi(this);
218+
219+
mSplash->showMessage(tr("Checking database"), Qt::AlignHCenter | Qt::AlignBottom);
220+
qApp->processEvents();
221+
// Do this early on before anyone else opens it and prevents us copying it
222+
createDB();
223+
219224
mSplash->showMessage(tr("Reading settings"), Qt::AlignHCenter | Qt::AlignBottom);
220225
qApp->processEvents();
221226
readSettings();
@@ -231,12 +236,9 @@ static void setTitleBarText_( QWidget & qgisApp )
231236
createCanvas();
232237
createOverview();
233238
createLegend();
234-
235-
fileNew(); // prepare empty project
236239

237-
mSplash->showMessage(tr("Checking database"), Qt::AlignHCenter | Qt::AlignBottom);
240+
fileNew(); // prepare empty project
238241
qApp->processEvents();
239-
createDB();
240242

241243
// register all GDAL and OGR plug-ins
242244
// Should this be here? isnt it the job of the provider? Tim

0 commit comments

Comments
 (0)
Please sign in to comment.