diff --git a/ChangeLog b/ChangeLog index c00f254fb..8c0149fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ Bug fixes: - #7095 Update account and upgrade links - #7096 The system duplicates hotkeys in setup - #7099 SYNERGY-854 Fix compilation with msvc 2014 -- #7100 No configuration available on Windows +- #7100 | #7101 No configuration available on Windows - #7097 The title "Enterprise" disappeares after clicking on "Preferences" Enhancements: diff --git a/src/gui/src/CommandProcess.cpp b/src/gui/src/CommandProcess.cpp index 361d14fe9..e86d5a30f 100644 --- a/src/gui/src/CommandProcess.cpp +++ b/src/gui/src/CommandProcess.cpp @@ -42,7 +42,7 @@ QString CommandProcess::run() } if (process.waitForFinished()) { - output = process.readAllStandardOutput().trimmed(); + output = QString::fromLocal8Bit(process.readAllStandardOutput().trimmed()); error = process.readAllStandardError().trimmed(); } }