diff options
author | George Hazan <ghazan@miranda.im> | 2020-06-16 18:12:36 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2020-06-16 18:12:36 +0300 |
commit | 8f35d58ce9fa00dc940b616d5ac7ea1e5421612f (patch) | |
tree | 165b6987ce030668d729362b700ec29ed06217d9 /plugins/New_GPG | |
parent | 3d8b3afe4f9b20bf8b393987e4f618ba3159b79d (diff) |
another fix for GPG launcher
Diffstat (limited to 'plugins/New_GPG')
-rwxr-xr-x | plugins/New_GPG/src/gpg_wrapper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp index 985f6e3b82..9f94c1dfeb 100755 --- a/plugins/New_GPG/src/gpg_wrapper.cpp +++ b/plugins/New_GPG/src/gpg_wrapper.cpp @@ -71,12 +71,12 @@ void pxEexcute_thread(gpg_execution_params *params) PathToAbsoluteW(L"\\", mir_path); bp::child *c; - std::future<std::string> pout; + std::future<std::string> pout, perr; boost::asio::io_context ios; if (params->bNoOutput) c = new bp::child(bin_path.c_str(), argv, bp::windows::hide, bp::std_in.close(), ios); else - c = new bp::child(bin_path.c_str(), argv, bp::windows::hide, bp::std_in.close(), bp::std_out > pout, bp::std_err > pout, ios); + c = new bp::child(bin_path.c_str(), argv, bp::windows::hide, bp::std_in.close(), bp::std_out > pout, bp::std_err > perr, ios); params->child = c; @@ -85,6 +85,8 @@ void pxEexcute_thread(gpg_execution_params *params) if (!params->bNoOutput) { params->out.Append(pout.get().c_str()); params->out.Append("\n"); + params->out.Append(perr.get().c_str()); + params->out.Append("\n"); params->out.Replace("\r\r", ""); if (globals.debuglog) |