Merge branch 'master' of github.com:mavlink/qgroundcontrol

libs/opmapcontrol/src/core/cache.cpp

@@ -41,9 +41,9 @@ namespace core {
     void Cache::setCacheLocation(const QString& value)
     {
         cache=value;
-        routeCache = cache + "RouteCache" + QDir::separator();
+        routeCache = cache + "RouteCache/";
-        geoCache = cache + "GeocoderCache"+ QDir::separator();
+        geoCache = cache + "GeocoderCache/";
-        placemarkCache = cache + "PlacemarkCache" + QDir::separator();
+        placemarkCache = cache + "PlacemarkCache/";
         ImageCache.setGtileCache(value);
     }
     QString Cache::CacheLocation()
@@ -54,7 +54,7 @@ namespace core {
     {
         if(cache.isNull()|cache.isEmpty())
         {
-            cache= Utils::PathUtils().GetStoragePath()+"mapscache"+QDir::separator();
+            cache = QDir::homePath() + "/mapscache/";
             setCacheLocation(cache);
         }
     }

src/comm/MAVLinkProtocol.cc

@@ -539,7 +539,7 @@ void MAVLinkProtocol::sendHeartbeat()
     {
         mavlink_message_t msg;
         mavlink_auth_key_t auth;
-        memset(auth, 0, sizeof(auth));
+        memset(&auth, 0, sizeof(auth));
         memcpy(auth.key, m_authKey.toStdString().c_str(), qMin(m_authKey.length(), MAVLINK_MSG_AUTH_KEY_FIELD_KEY_LEN));
         mavlink_msg_auth_key_encode(getSystemId(), getComponentId(), &msg, &auth);
         sendMessage(msg);