diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-15 10:36:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 10:36:09 +0200 |
| commit | 4b06255cc26933379107745d95f72097737d2a9b (patch) | |
| tree | 60e00c8389bb2d8e4be492531beb788a253d1b6a /launcher/Application.cpp | |
| parent | 3aba7f8fec45c7c87be486d8f6b5c96f69facf93 (diff) | |
| parent | 1939e3e6ed3d2d2d4199d90154333cc8892eafeb (diff) | |
| download | PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.tar.gz PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.tar.bz2 PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.zip | |
Merge pull request #1486 from PrismLauncher/staging
Diffstat (limited to 'launcher/Application.cpp')
| -rw-r--r-- | launcher/Application.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 7c7fc746..6194527c 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -136,11 +136,7 @@ #endif #if defined Q_OS_WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include <stdio.h> -#include <windows.h> +#include "WindowsConsole.h" #endif #define STRINGIFY(x) #x @@ -172,22 +168,8 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext& context, const QSt Application::Application(int& argc, char** argv) : QApplication(argc, argv) { #if defined Q_OS_WIN32 - // attach the parent console - if (AttachConsole(ATTACH_PARENT_PROCESS)) { - // if attach succeeds, reopen and sync all the i/o - if (freopen("CON", "w", stdout)) { - std::cout.sync_with_stdio(); - } - if (freopen("CON", "w", stderr)) { - std::cerr.sync_with_stdio(); - } - if (freopen("CON", "r", stdin)) { - std::cin.sync_with_stdio(); - } - auto out = GetStdHandle(STD_OUTPUT_HANDLE); - DWORD written; - const char* endline = "\n"; - WriteConsole(out, endline, strlen(endline), &written, NULL); + // attach the parent console if stdout not already captured + if (AttachWindowsConsole()) { consoleAttached = true; } #endif |