From 64ba6cae1e6b74929d88de628bb2915cb9c6f2d2 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 1 Aug 2020 11:03:09 -0400
Subject: revert font scaling:  - users report low quality splash screen  -
 sticking with qt's default is better in the long run  - can still use the
 environment variable

revert network timer:
 - users report error in log every second
 - was a blind fix anyway, can't reliably reproduce it
---
 src/nxmaccessmanager.cpp | 44 ++++----------------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

(limited to 'src/nxmaccessmanager.cpp')

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 9fe00f88..2fe676ba 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -772,46 +772,10 @@ NXMAccessManager::NXMAccessManager(QObject *parent, const QString &moVersion)
   setCookieJar(new PersistentCookieJar(QDir::fromNativeSeparators(
     Settings::instance().paths().cache() + "/nexus_cookies.dat")));
 
-  networkAccessibleFix();
-}
-
-void NXMAccessManager::networkAccessibleFix()
-{
-  // Qt 5.14 seems to have introduced a regression with network accessibility
-  // where some users say MO can't access the network at all
-  //
-  // some users use a vpn, one other had a dns resolver
-  //
-  // it looks like networkAccessible() is sometimes set to NotAccessible,
-  // which prevents all network requests from even reaching the OS
-  //
-  // there are some events that seem like they should be fired, like
-  // QNetworkAccessManager::networkAccessibleChanged, but they're not
-  //
-  // the only solution that seems to kinda work is just to start a timer,
-  // check when networkAccessible() is changed to NotAccessible and revert it
-  // to UnknownAccessibility
-  //
-  // see also:
-  // https://github.com/ModOrganizer2/modorganizer/issues/1173
-  // https://bugreports.qt.io/browse/QTBUG-55180
-
-  // check first
-  if (networkAccessible() == QNetworkAccessManager::NotAccessible) {
-    log::debug("network is not accessible, forcing to unknown");
-    setNetworkAccessible(QNetworkAccessManager::UnknownAccessibility);
-  }
-
-  auto* t = new QTimer(this);
-
-  connect(t, &QTimer::timeout, [&]{
-    if (networkAccessible() == QNetworkAccessManager::NotAccessible) {
-      log::debug("network is not accessible, forcing to unknown");
-      setNetworkAccessible(QNetworkAccessManager::UnknownAccessibility);
-    }
-  });
-
-  t->start(std::chrono::seconds(1));
+  if (networkAccessible() == QNetworkAccessManager::UnknownAccessibility) {
+    // why is this necessary all of a sudden?
+    setNetworkAccessible(QNetworkAccessManager::Accessible);
+  }
 }
 
 void NXMAccessManager::setTopLevelWidget(QWidget* w)
-- 
cgit v1.3.1