Skip to content

Commit

Permalink
Fix problem where the user copy of the qgis.db database wasn't being
Browse files Browse the repository at this point in the history
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/qgis@5944 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Oct 13, 2006
1 parent cb27ea5 commit 6634ed5
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/gui/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,13 @@ static void setTitleBarText_( QWidget & qgisApp )
: QMainWindow(parent,fl),
mSplash(splash)
{

setupUi(this);

mSplash->showMessage(tr("Checking database"), Qt::AlignHCenter | Qt::AlignBottom);
qApp->processEvents();
// Do this early on before anyone else opens it and prevents us copying it
createDB();

mSplash->showMessage(tr("Reading settings"), Qt::AlignHCenter | Qt::AlignBottom);
qApp->processEvents();
readSettings();
Expand All @@ -231,12 +236,9 @@ static void setTitleBarText_( QWidget & qgisApp )
createCanvas();
createOverview();
createLegend();

fileNew(); // prepare empty project

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

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

0 comments on commit 6634ed5

Please sign in to comment.