diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/guiutil.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/misc.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/rawtransaction.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index edf1c29ea1..a46e0561b9 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -417,7 +417,7 @@ void openDebugLogfile() bool openBitcoinConf() { - boost::filesystem::path pathConfig = GetConfigFile(BITCOIN_CONF_FILENAME); + boost::filesystem::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); /* Create the file */ boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app); diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 61bd59e9ed..f573c7dbeb 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -98,7 +98,7 @@ UniValue createmultisig(const JSONRPCRequest& request) "\nCreates a multi-signature address with n signature of m keys required.\n" "It returns a json object with the address and redeemScript.\n" "\nArguments:\n" - "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" + "1. nrequired (numeric, required) The number of required signatures out of the n keys.\n" "2. \"keys\" (string, required) A json array of hex-encoded public keys\n" " [\n" " \"key\" (string) The hex-encoded public key\n" diff --git a/src/rpc/rawtransaction.h b/src/rpc/rawtransaction.h index 2186c1d5e7..ec9d1f2cf0 100644 --- a/src/rpc/rawtransaction.h +++ b/src/rpc/rawtransaction.h @@ -6,7 +6,7 @@ #define BITCOIN_RPC_RAWTRANSACTION_H class CBasicKeyStore; -class CMutableTransaction; +struct CMutableTransaction; class UniValue; /** Sign a transaction with the given keystore and previous transactions */ |