A merged changes

This commit is contained in:
Werner Koch 2010-11-08 09:18:47 +00:00
parent b4da5a4150
commit cb68b5d923
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2010-11-04 Werner Koch <wk@g10code.com>
* logging.c (do_logv) [W32]: Don't set a default log stream if the
registry entry is empty.
2010-10-27 Werner Koch <wk@g10code.com>
* gettime.c (gnupg_get_isotime): Compare to (time_t)-1.

View File

@ -577,7 +577,7 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
"DefaultLogFile");
log_set_file (tmp);
log_set_file (tmp && *tmp? tmp : NULL);
jnlib_free (tmp);
#else
log_set_file (NULL); /* Make sure a log stream has been set. */