From 6dc5497313a2dc31878aaeeb756271510b9b1480 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 18 Jan 2022 17:57:29 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#24095: util: Fix mis-swapped `prettyIndent` and `indentLevel` arguments f25114148320c3fe07af3abc6e2f150d0a2c10f4 util: Fix mis-swapped `prettyIndent` and `indentLevel` arguments (Hennadii Stepanov) Pull request description: On master d0bf9bb6a539f151ec92725d20a2b6c22cb095a5: ``` $ cat settings.json { "wallet": [ "210803d" ] } ``` With this PR: ``` $ cat settings.json { "wallet": [ "210803d" ] } ``` ACKs for top commit: ryanofsky: Code review ACK f25114148320c3fe07af3abc6e2f150d0a2c10f4. Nice catch! Tree-SHA512: 1c315c807a070039c05a77f4e8855011d468b9aeb141e4fa3b1e1aaaab252e3831e8bdfe0caddf7704a00492799022f761f6d21a047c5bf75cdbcc96f04fc04e --- src/util/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/settings.cpp b/src/util/settings.cpp index 5a8823747d..c01f29647f 100644 --- a/src/util/settings.cpp +++ b/src/util/settings.cpp @@ -112,7 +112,7 @@ bool WriteSettings(const fs::path& path, errors.emplace_back(strprintf("Error: Unable to open settings file %s for writing", path.string())); return false; } - file << out.write(/* prettyIndent= */ 1, /* indentLevel= */ 4) << std::endl; + file << out.write(/* prettyIndent= */ 4, /* indentLevel= */ 1) << std::endl; file.close(); return true; }