From a20e1a0db96a3104573aa9e82109105125785059 Mon Sep 17 00:00:00 2001
From: lateminer <late-miner@ya.ru>
Date: Sat, 13 Oct 2018 02:36:24 +0300
Subject: [PATCH] Take care of backporting errors

---
 src/wallet/rpcdump.cpp | 4 ++--
 src/wallet/wallet.h    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index b66657a67..627d42783 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -173,8 +173,8 @@ UniValue abortrescan(const UniValue& params, bool fHelp)
             + HelpExampleRpc("abortrescan", "")
         );
 
-    if (!pwallet->IsScanning() || pwallet->IsAbortingRescan()) return false;
-    pwallet->AbortRescan();
+    if (!pwalletMain->IsScanning() || pwalletMain->IsAbortingRescan()) return false;
+    pwalletMain->AbortRescan();
     return true;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 514bd52a6..47e66fc0a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -18,6 +18,7 @@
 #include "wallet/rpcwallet.h"
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <set>
 #include <stdexcept>