idk wip status sync ui stuff

diff --git a/src/main.cpp b/src/main.cpp
index 05b1bfd91ca3bc724518cf4e3a64ac973a4152cd..3e0afd3236ee9d276f05de03624bffa9a6c4551e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,7 +184,11 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
     }
 
     if (parser.isSet("quiet") || conf()->get(Config::disableLogging).toBool()) {
-        qWarning() << "Logging is disabled";
+        if (conf()->get(Config::disableLogging).toBool()) {
+            qWarning() << "Logging is disabled via configuration";
+        } else {
+            qWarning() << "Logging is disabled via --quiet flag";
+        }
         WalletManager::instance()->setLogLevel(-1);
     }
     else if (logLevel >= 0 && logLevel <= Monero::WalletManagerFactory::LogLevel_Max) {

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index 12f05c5a5a17275ab3c8e46d840420d7853d40dd..556e6cb08639626a06fbd5e0898d625a9c53966d 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -559,7 +559,7 @@ QTextCharFormat addressTextFormat(const SubaddressIndex &index, quint64 amount)
 }
 
 void applicationLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
-    if (conf()->get(Config::disableLoggingStdout).toBool())
+    if (conf()->get(Config::disableLoggingStdout).toBool() || conf()->get(Config::disableLogging).toBool())
         return;
 
     int level = conf()->get(Config::logLevel).toInt();

diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp
index beedb42a46d7acc4056a3318800e8ea30dc41ade..396890dd659619934b34d6364bd122a30cf165d2 100644 (file)
--- a/src/utils/nodes.cpp
+++ b/src/utils/nodes.cpp
@@ -285,6 +285,10 @@ void Nodes::autoConnect(bool forceReconnect) {
     }
 
     Wallet::ConnectionStatus status = m_wallet->connectionStatus();
+    if (status == Wallet::ConnectionStatus_Connecting && !forceReconnect) {
+        return;
+    }
+
     bool wsMode = (this->source() == NodeSource::websocket);
 
     if (wsMode && !m_wsNodesReceived && websocketNodes().count() == 0) {