Merge bitcoin/bitcoin#29658: Bugfix: GUI: Help messages already have a trailing newline, so don't add an extra one

hebasto · hebasto · commit ee9491369faa · 2024-05-12T14:21:21.000+01:00
d1ed09a Bugfix: GUI: Help messages already have a trailing newline, so don't add an extra one (Luke Dashjr) Pull request description: Reviewing #29585, I noticed that `bitcoin-qt` adds an extra newline for `-help` and `-version` beyond the other binaries'. ACKs for top commit: hebasto: ACK d1ed09a, tested on Ubuntu 24.04. Tree-SHA512: 15ee9d1060c2492bb3b04a0ac4cb53f7b959bbe32bce415793da0c221f1c963c8f2bb3996ea07d1a7c192bfc2e23be2cd7d4e5649c592eb3fc03906c2763f1aa
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -115,7 +115,7 @@ HelpMessageDialog::~HelpMessageDialog()
 void HelpMessageDialog::printToConsole()
 {
     // On other operating systems, the expected action is to print the message to the console.
-    tfm::format(std::cout, "%s\n", qPrintable(text));
+    tfm::format(std::cout, "%s", qPrintable(text));
 }
 
 void HelpMessageDialog::showOrPrint()

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ HelpMessageDialog::~HelpMessageDialog()`
`115`	`115`	`void HelpMessageDialog::printToConsole()`
`116`	`116`	`{`
`117`	`117`	`// On other operating systems, the expected action is to print the message to the console.`
`118`		`- tfm::format(std::cout, "%s\n", qPrintable(text));`
	`118`	`+ tfm::format(std::cout, "%s", qPrintable(text));`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`void HelpMessageDialog::showOrPrint()`