2 files changed, 7 insertions, 1 deletions
diff --git a/context.cpp b/context.cpp
index 736eba5..46dcbc6 100644
--- a/context.cpp
+++ b/context.cpp
@@ -320,6 +320,7 @@ bool Context::decrypt(const QByteArray &inBuffer, QByteArray *outBuffer)
     }
     if (err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) {
         QMessageBox::critical(0, tr("Error decrypting:"), gpgme_strerror(err));
+        return false;
     }
 
     //if (err != GPG_ERR_NO_ERROR)
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 0771e52..45247b2 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -503,7 +503,12 @@ void GpgWin::decrypt()
     QByteArray *decrypted = new QByteArray();
     QByteArray text = edit->curTextPage()->toPlainText().toAscii(); // TODO: toUtf8() here?
     preventNoDataErr(&text);
-    mCtx->decrypt(text, decrypted);
+
+    // try decrypt, if fail do nothing, especially don't replace text
+    if(!mCtx->decrypt(text, decrypted)) {
+        return;
+    }
+        ;
     /**
          *   1) is it mime (content-type:)
          *   2) parse header