diff --git a/src/connection.cpp b/src/connection.cpp index 0051521..04b1bb0 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -71,7 +71,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { main->logger->write("Embedded hushd started up, trying autoconnect in 1 sec"); QTimer::singleShot(1000, [=]() { doAutoConnect(); } ); } else { - if (config->zcashDaemon) { + if (config->hushDaemon) { // hushd is configured to run as a daemon, so we must wait for a few seconds // to let it start up. main->logger->write("hushd is daemon=1. Waiting for it to start up"); @@ -89,7 +89,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { // We tried to start ehushd previously, and it didn't work. So, show the error. main->logger->write("Couldn't start embedded hushd for unknown reason"); QString explanation; - if (config->zcashDaemon) { + if (config->hushDaemon) { explanation = QString() % QObject::tr("You have hushd set to start as a daemon, which can cause problems " "with SilentDragon\n\n." "Please remove the following line from your HUSH3.conf and restart SilentDragon\n" @@ -655,7 +655,7 @@ std::shared_ptr ConnectionLoader::autoDetectZcashConf() { zcashconf->connType = ConnectionType::DetectedConfExternalHushD; zcashconf->usingZcashConf = true; zcashconf->zcashDir = QFileInfo(confLocation).absoluteDir().absolutePath(); - zcashconf->zcashDaemon = false; + zcashconf->hushDaemon = false; Settings::getInstance()->setUsingZcashConf(confLocation); @@ -675,7 +675,7 @@ std::shared_ptr ConnectionLoader::autoDetectZcashConf() { zcashconf->port = value; } if (name == "daemon" && value == "1") { - zcashconf->zcashDaemon = true; + zcashconf->hushDaemon = true; } if (name == "proxy") { zcashconf->proxy = value; diff --git a/src/connection.h b/src/connection.h index 12eb239..743e23a 100644 --- a/src/connection.h +++ b/src/connection.h @@ -21,7 +21,7 @@ struct ConnectionConfig { QString rpcuser; QString rpcpassword; bool usingZcashConf; - bool zcashDaemon; + bool hushDaemon; QString zcashDir; QString proxy; QString consolidation; diff --git a/src/rpc.cpp b/src/rpc.cpp index b65a9d4..62921cd 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1254,7 +1254,7 @@ void RPC::shutdownZcashd() { if ((ehushd->atEnd() && ehushd->processId() == 0) || ehushd->state() == QProcess::NotRunning || waitCount > 30 || - conn->config->zcashDaemon) { // If hushd is daemon, then we don't have to do anything else + conn->config->hushDaemon) { // If hushd is daemon, then we don't have to do anything else qDebug() << "Ended"; waiter.stop(); QTimer::singleShot(1000, [&]() { d.accept(); });