diff options
| author | Kode <TheKodeToad@proton.me> | 2023-05-13 19:07:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 19:07:03 +0100 |
| commit | f60562c5a247934e39ab33a6d1c5ce64b3127f6a (patch) | |
| tree | 3e0ff5817464de7c050c580397503daa9f0ee7bd /launcher/LoggedProcess.h | |
| parent | 18cfe219fef2aabc1d3260764c02cd3476615176 (diff) | |
| parent | d5c6a1b4d1e6d052e42366d19ffa0047168e030d (diff) | |
| download | PrismLauncher-f60562c5a247934e39ab33a6d1c5ce64b3127f6a.tar.gz PrismLauncher-f60562c5a247934e39ab33a6d1c5ce64b3127f6a.tar.bz2 PrismLauncher-f60562c5a247934e39ab33a6d1c5ce64b3127f6a.zip | |
Merge branch 'develop' into mrpack-export
Signed-off-by: Kode <TheKodeToad@proton.me>
Diffstat (limited to 'launcher/LoggedProcess.h')
| -rw-r--r-- | launcher/LoggedProcess.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/launcher/LoggedProcess.h b/launcher/LoggedProcess.h index 2360d1ea..af3ed79f 100644 --- a/launcher/LoggedProcess.h +++ b/launcher/LoggedProcess.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only /* - * PolyMC - Minecraft Launcher - * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> + * Prism Launcher - Minecraft Launcher + * Copyright (C) 2022,2023 Sefa Eyeoglu <contact@scrumplex.net> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -88,9 +88,12 @@ private slots: private: void changeState(LoggedProcess::State state); + QStringList reprocess(const QByteArray& data, QTextDecoder& decoder); + private: QTextDecoder m_err_decoder = QTextDecoder(QTextCodec::codecForLocale()); QTextDecoder m_out_decoder = QTextDecoder(QTextCodec::codecForLocale()); + QString m_leftover_line; bool m_killed = false; State m_state = NotRunning; int m_exit_code = 0; |