z2000 final

App/mainwindow.cpp

@@ -195,7 +195,7 @@ MainWindow::MainWindow(QWidget *parent)
     map->setAttribute(Qt::WA_AlwaysStackOnTop);
 
     //QString maptype = myinifile->ReadIni("GCS.ini","Map","Type");
-    map->SetMapType(mapcontrol::Helper::MapTypeFromString("BingSatellite"));
+    map->SetMapType(mapcontrol::Helper::MapTypeFromString("BingHybrid"));
     map->setWPLock(true);
     map->setFocus();
     map->setMouseTracking(true);

opmap/core/opmaps.cpp

@@ -223,7 +223,7 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
                 errorvars.lock();
                 ++diag.timeouts;
                 errorvars.unlock();
-                //return ret;
+                return ret;
             }
             tT.stop();
             if ((reply->error() != QNetworkReply::NoError)) {