summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2016-09-26 21:53:06 +0200
committerGitHub <noreply@github.com>2016-09-26 21:53:06 +0200
commit0ebebfa34412b962727a9847656b2d19c573c76b (patch)
treec8f2063a47d972cd788981dedeebf30e1cf1dd10
parent5b3b2e0ce373baba028929787c0399b9bb6c45ba (diff)
parente7a3392bf4b01eaff3783cfd5e6e0b68273958c2 (diff)
Merge pull request #199 from asalamon74/issue91_bugfix
issue 91 bugfix
-rw-r--r--mainwindow.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8161a771..2892d687 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -789,7 +789,9 @@ void MainWindow::readyRead(bool finished = false) {
QString error = "";
if (currentAction != GPG_INTERNAL) {
error = process->readAllStandardError();
- output = process->readAllStandardOutput();
+ QByteArray processOutBytes = process->readAllStandardOutput();
+ QTextCodec *codec = QTextCodec::codecForLocale();
+ output = codec->toUnicode(processOutBytes);
if (finished && currentAction == GPG) {
lastDecrypt = output;
QStringList tokens = output.split("\n");