From e293da3b214958ff86e7636d17b0b6e10264882e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Sun, 17 Oct 2021 14:26:28 +0200
Subject: common,w32: Do not always print "Garbled console data" warning.

* common/init.c (_init_common_subsystems): Silence message.
--
---
 common/init.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'common/init.c')

diff --git a/common/init.c b/common/init.c
index 7b6b4aea0..7d4119268 100644
--- a/common/init.c
+++ b/common/init.c
@@ -208,8 +208,14 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
   gettext_use_utf8 (1);
   if (!SetConsoleCP (CP_UTF8) || !SetConsoleOutputCP (CP_UTF8))
     {
-      log_info ("SetConsoleCP failed: %s\n", w32_strerror (-1));
-      log_info ("Warning: Garbled console data possible\n");
+      /* Don't show the error if the program does not have a console.
+       * This is for example the case for daemons.  */
+      in rc = GetLastError ();
+      if (rc != ERROR_INVALID_HANDLE)
+        {
+          log_info ("SetConsoleCP failed: %s\n", w32_strerror (rc));
+          log_info ("Warning: Garbled console data possible\n");
+        }
     }
 #endif
 
-- 
cgit v1.2.3