mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-01-14 00:58:09 +00:00
Merge pull request #4294 from laanwj/2014_06_no_global_strwallet
Remove global strWalletFile
This commit is contained in:
commit
5795aaca26
@ -40,7 +40,6 @@ using namespace std;
|
|||||||
using namespace boost;
|
using namespace boost;
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
std::string strWalletFile;
|
|
||||||
CWallet* pwalletMain;
|
CWallet* pwalletMain;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -584,7 +583,7 @@ bool AppInit2(boost::thread_group& threadGroup)
|
|||||||
}
|
}
|
||||||
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
|
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
|
||||||
|
|
||||||
strWalletFile = GetArg("-wallet", "wallet.dat");
|
std::string strWalletFile = GetArg("-wallet", "wallet.dat");
|
||||||
#endif
|
#endif
|
||||||
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
|
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@ namespace boost {
|
|||||||
class thread_group;
|
class thread_group;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern std::string strWalletFile;
|
|
||||||
extern CWallet* pwalletMain;
|
extern CWallet* pwalletMain;
|
||||||
|
|
||||||
void StartShutdown();
|
void StartShutdown();
|
||||||
|
Loading…
Reference in New Issue
Block a user