steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-06 14:00:16 +02:00
Code Issues Packages Projects Releases 66 Wiki Activity

Merge pull request #5196 from Sonicadvance1/39

Browse Source 
Config: Remove stdout from OutputLog
This commit is contained in:
LC authored and GitHub committed 2026-01-04 19:33:32 -05:00
2 parents b40768895d 96033fd225
commit e1c6a910d2
3 files changed
+5 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FEXCore/Source/Interface/Config/Config.json.in
+1 -1
View File
@@ -371,7 +371,7 @@
"Default": "server",
"Desc": [
"File to write FEX output to.",
"[stdout, stderr, server, <Filename>]"
"[stderr, server, <Filename>]"
]
},
"TelemetryDirectory": {
Source/Tools/FEXConfig/main.qml
+4 -5
View File
@@ -448,12 +448,12 @@ ApplicationWindow {
id: loggingComboBox
property string configValue: ConfigModel.has("OutputLog", refreshCache) ? ConfigModel.getString("OutputLog", refreshCache) : ""
currentIndex: configValue === "" ? -1 : configValue == "server" ? 0 : configValue == "stderr" ? 1 : configValue == "stdout" ? 2 : 3
currentIndex: configValue === "" ? -1 : configValue == "server" ? 0 : configValue == "stderr" ? 1 : 2
onActivated: {
configDirty = true
var configNames = [ "server", "stderr", "stdout" ]
if (currentIndex != -1 && currentIndex < 3) {
var configNames = [ "server", "stderr" ]
if (currentIndex != -1 && currentIndex < 2) {
ConfigModel.setString("OutputLog", configNames[currentIndex])
} else {
// Set by text field below
@@ -463,13 +463,12 @@ ApplicationWindow {
model: ListModel {
ListElement { text: "FEXServer" }
ListElement { text: "stderr" }
ListElement { text: "stdout" }
ListElement { text: qsTr("File...") }
}
}
ConfigTextFieldForPath {
visible: loggingComboBox.currentIndex === 3
visible: loggingComboBox.currentIndex === 2
config: "OutputLog"
}
}
Source/Tools/FEXInterpreter/FEXInterpreter.cpp
-2
View File
@@ -118,8 +118,6 @@ void Init() {
auto LogFD = OutputFD;
if (LogFile == "stderr") {
LogFD = dup(STDERR_FILENO);
} else if (LogFile == "stdout") {
LogFD = dup(STDOUT_FILENO);
} else if (LogFile == "server") {
Logging::FEXServer::FEXServerFD = FEXServerClient::RequestLogFD(FEXServerClient::GetServerFD());
if (FEXServer::FEXServerFD != -1) {