#49 - Handle zcashd set to daemon=1

2018-11-21 09:46:57 -08:00
parent ce9af00302
commit 3167fb97d4
3 changed files with 36 additions and 17 deletions
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -940,8 +940,10 @@ void RPC::shutdownZcashd() {
    int waitCount = 0;
    QObject::connect(&waiter, &QTimer::timeout, [&] () {
        waitCount++;
+
        if ((ezcashd->atEnd() && ezcashd->processId() == 0) ||
-            waitCount > 30) {
+            waitCount > 30 || 
+            conn->config->zcashDaemon)  {   // If zcashd is daemon, then we don't have to do anything else
            qDebug() << "Ended";
            waiter.stop();
            QTimer::singleShot(1000, [&]() { d.accept(); });