GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core,w32: Show w32-spawn warning only once

Browse Source 
* src/w32-io.c (_gpgme_io_spawn): Show MessageBox only once.

--
This prevents multiple message boxes from showing when
the GPGME installation is unworkable.

GnuPG-Bug-Id: T4453
This commit is contained in:
Andre Heinecke 2019-04-09 13:25:08 +02:00
parent 4a4680f890
commit 937adfdcbb
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/w32-io.c
View File

@ -1389,6 +1389,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
int tmp_fd; int tmp_fd;
char *tmp_name; char *tmp_name;
const char *spawnhelper; const char *spawnhelper;
static int spawn_warning_shown = 0;
TRACE_BEG (DEBUG_SYSIO, "_gpgme_io_spawn", path, TRACE_BEG (DEBUG_SYSIO, "_gpgme_io_spawn", path,
"path=%s", path); "path=%s", path);
@ -1456,6 +1457,8 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
up their installation this should also be properly communicated up their installation this should also be properly communicated
as otherwise calls to gnupg will result in unsupported protocol as otherwise calls to gnupg will result in unsupported protocol
errors that do not explain a lot. */ errors that do not explain a lot. */
if (!spawn_warning_shown)
{
char *msg; char *msg;
gpgrt_asprintf (&msg, "gpgme-w32spawn.exe was not found in the " gpgrt_asprintf (&msg, "gpgme-w32spawn.exe was not found in the "
"detected installation directory of GpgME" "detected installation directory of GpgME"
@ -1470,6 +1473,8 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
_gpgme_get_inst_dir ()); _gpgme_get_inst_dir ());
MessageBoxA (NULL, msg, "GpgME not installed correctly", MB_OK); MessageBoxA (NULL, msg, "GpgME not installed correctly", MB_OK);
gpgrt_free (msg); gpgrt_free (msg);
spawn_warning_shown = 1;
}
gpg_err_set_errno (EIO); gpg_err_set_errno (EIO);
close (tmp_fd); close (tmp_fd);
DeleteFileA (tmp_name); DeleteFileA (tmp_name);