diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-06-12 00:49:44 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-06-12 00:55:43 +0300 |
| commit | a8c8dbc98fa9acd653f6eff5d82c41c384dd2864 (patch) | |
| tree | 907ff9961f56e042348c03fb1b7197d9e18e3c6a /src | |
| parent | f66eceaecf464bfab5e19f3ca8fe680d8a6aa2e1 (diff) | |
| parent | d7f3b1af21daa93165b3726fee059a55b7727280 (diff) | |
Merge bitcoin-core/gui#361: Fix gui segfault caused by bitcoin/bitcoin#22216
d7f3b1af21daa93165b3726fee059a55b7727280 Fix gui segfault caused by bitcoin/bitcoin#22216 (Russell Yanofsky)
Pull request description:
Reported by Hennadii Stepanov https://github.com/bitcoin/bitcoin/pull/22216#issuecomment-859790682
Fixes bitcoin/bitcoin#22227
ACKs for top commit:
hebasto:
ACK d7f3b1af21daa93165b3726fee059a55b7727280, tested on Linux Mint 20.1 (Qt 5.12.8).
jarolrod:
ACK d7f3b1af21daa93165b3726fee059a55b7727280
Tree-SHA512: d672bfa9f1bcd500a879ec7ed27096086ae93b73ad5da8090f29cc5b6d985c46a76583cc384304d67210f87b6b839c2391f0fcc24fd3588c4a014e540283fdfe
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 65bba1dd10..442c813a5a 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -490,6 +490,7 @@ int GuiMain(int argc, char* argv[]) /// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these // Command-line options take precedence: + node_context.args = &gArgs; SetupServerArgs(gArgs); SetupUIArgs(gArgs); std::string error; |