Fixed strange OpenPilot startup bug - needs more investigation though.

src/configuration.h

@@ -12,7 +12,7 @@
 #define WITH_TEXT_TO_SPEECH 1
 
 #define QGC_APPLICATION_NAME "QGroundControl"
-#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC3)"
+#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC16)"
 
 namespace QGC
 

src/libs/opmapcontrol/src/core/pureimagecache.cpp

@@ -226,31 +226,25 @@ namespace core {
         qDebug()<<"Cache dir="<<dir<<" Try to GET:"<<pos.X()+","+pos.Y();
 #endif //DEBUG_PUREIMAGECACHE
 
-        {
             QString db=dir+"Data.qmdb";
-            {
-                QSqlDatabase cn;
+            QSqlDatabase cn;
 
-                cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
+            cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
 
-                cn.setDatabaseName(db);
-                cn.setConnectOptions("QSQLITE_ENABLE_SHARED_CACHE");
-                if(cn.open())
-                {
-                    {
-                        QSqlQuery query(cn);
-                        query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
-                        query.next();
-                        if(query.isValid())
-                        {
-                            ar=query.value(0).toByteArray();
-                        }
-                    }
-                    cn.close();
+            cn.setDatabaseName(db);
+            cn.setConnectOptions("QSQLITE_ENABLE_SHARED_CACHE");
+            if(cn.open())
+            {
+				QSqlQuery query(cn);
+				query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
+				query.next();
+				if(query.isValid())
+				{
+					ar=query.value(0).toByteArray();
                 }
-            }
-        }
-        QSqlDatabase::removeDatabase(QString::number(id));
+                cn.close();
+             }
+			QSqlDatabase::removeDatabase(QString::number(id));
         lock.unlock();
         return ar;
     }

src/uas/UASManager.h

@@ -246,6 +246,7 @@ protected:
     void initReference(const double & latitude, const double & longitude, const double & altitude);
 
 signals:
+
     void UASCreated(UASInterface* UAS);
     /** @brief The UAS currently under main operator control changed */
     void activeUASSet(UASInterface* UAS);