Skip to content

Commit

Permalink
fix: output --version to stdout (#5727)
Browse files Browse the repository at this point in the history
  • Loading branch information
pajlada authored Nov 23, 2024
1 parent 2a38e39 commit a8269a5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
- Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
- Dev: Refactored IRC message building. (#5663)
- Dev: Fixed some compiler warnings. (#5672)
- Dev: Explicitly print output from `--version` to `stdout`. (#5727)
- Dev: Unified parsing of historic and live IRC messages. (#5678)
- Dev: 7TV's `entitlement.reset` is now explicitly ignored. (#5685)
- Dev: Qt 6.8 and later now default to the GDI fontengine. (#5710)
Expand Down
21 changes: 13 additions & 8 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,16 @@ int main(int argc, char **argv)
QMessageBox box;
if (Modes::instance().isPortable)
{
box.setText(
auto errorMessage =
error.what() +
QStringLiteral(
"\n\nInfo: Portable mode requires the application to "
"be in a writeable location. If you don't want "
"portable mode reinstall the application. "
"https://chatterino.com."));
"https://chatterino.com.");
std::cerr << errorMessage.toLocal8Bit().constData() << '\n';
std::cerr.flush();
box.setText(errorMessage);
}
else
{
Expand All @@ -77,12 +80,14 @@ int main(int argc, char **argv)
attachToConsole();

auto version = Version::instance();
qInfo().noquote() << QString("%1 (commit %2%3)")
.arg(version.fullVersion())
.arg(version.commitHash())
.arg(Modes::instance().isNightly
? ", " + version.dateOfBuild()
: "");
auto versionMessage =
QString("%1 (commit %2%3)")
.arg(version.fullVersion())
.arg(version.commitHash())
.arg(Modes::instance().isNightly ? ", " + version.dateOfBuild()
: "");
std::cout << versionMessage.toLocal8Bit().constData() << '\n';
std::cout.flush();
}
else
{
Expand Down

0 comments on commit a8269a5

Please sign in to comment.