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

src/gui/qgisapp.cpp

@@ -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();
@@ -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