From 891a058f17af56415cea6a02a0b9bb0432d10455 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 6 Jul 2019 03:03:56 +0200
Subject: [PATCH] Ref T698, enable network stats for restricted distributions

---
 src/blackcore/network.cpp                          | 12 ++++++++++++
 src/blackcore/network.h                            |  3 +++
 src/blackcore/vatsim/networkvatlib.cpp             |  1 +
 src/blackmisc/simulation/fscommon/fscommonutil.cpp |  7 ++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/blackcore/network.cpp b/src/blackcore/network.cpp
index 251427cbb..88182d191 100644
--- a/src/blackcore/network.cpp
+++ b/src/blackcore/network.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "network.h"
+#include "blackcore/application.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/logmessage.h"
@@ -115,4 +116,15 @@ namespace BlackCore
         return CFileUtils::writeStringToFile(s, fp);
     }
 
+    void INetwork::connectedToNewtork()
+    {
+        if (!sApp || sApp->isShuttingDown()) { return; }
+        if (!m_statistics && (CBuildConfig::isLocalDeveloperDebugBuild() || sApp->getOwnDistribution().isRestricted()))
+        {
+            // enable for local and restricted versions (alpha, ...)
+            CLogMessage("Enabled network statistics");
+            m_statistics = true;
+        }
+    }
+
 } // ns
diff --git a/src/blackcore/network.h b/src/blackcore/network.h
index acd3bec7d..8dd3213ad 100644
--- a/src/blackcore/network.h
+++ b/src/blackcore/network.h
@@ -603,6 +603,9 @@ namespace BlackCore
         //! Save the statistics
         bool saveNetworkStatistics(const QString &server);
 
+        //! Connected to network
+        void connectedToNewtork();
+
     private:
         bool                             m_statistics = false;
         QMap    <QString, int>           m_callStatistics;
diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index 00a4a7606..392e83d6a 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -293,6 +293,7 @@ namespace BlackCore
                 {
                     m_server.setConnectedSinceNow();
                     this->setCurrentEcosystem(m_server.getEcosystem());
+                    this->connectedToNewtork();
                 }
                 else
                 {
diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
index e1200b539..31c2a3c52 100644
--- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp
+++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
@@ -418,6 +418,7 @@ namespace BlackMisc
 
             QSet<QString> CFsCommonUtil::findP3dConfigFiles(const QString &configFile, const QString &versionHint)
             {
+                // locations will be swift paths, I will go one level up and then search for Lockheed Martin
                 const QStringList locations = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
                 QSet<QString> files;
                 for (const QString &path : locations)
@@ -425,6 +426,7 @@ namespace BlackMisc
                     const QString pathUp = CFileUtils::appendFilePaths(CFileUtils::pathUp(path), "Lockheed Martin");
                     const QDir d(pathUp);
                     if (!d.exists()) { continue; }
+                    if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"P3D config dir: '%1'") << d.absolutePath(); }
 
                     // all versions sub directories
                     // looking for "add-ons.cfg" or simobjects.cfg
@@ -657,7 +659,10 @@ namespace BlackMisc
                 return CFsCommonUtil::validateSimObjectsPath(simObjectDirs, models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
             }
 
-            CStatusMessageList CFsCommonUtil::validateSimObjectsPath(const QSet<QString> &simObjectDirs, const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped)
+            CStatusMessageList CFsCommonUtil::validateSimObjectsPath(
+                const QSet<QString> &simObjectDirs, const CAircraftModelList &models,
+                CAircraftModelList &validModels, CAircraftModelList &invalidModels,
+                bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped)
             {
                 CAircraftModelList sorted(models);
                 sorted.sortByFileName();