diff options
| -rw-r--r-- | plugins/checksum/checksum.c | 14 | ||||
| -rw-r--r-- | win32/spelling/hexchat-spelling.skel.iss | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c index e5da9dd5..cedabc21 100644 --- a/plugins/checksum/checksum.c +++ b/plugins/checksum/checksum.c @@ -173,13 +173,22 @@ dccrecv_cb (char *word[], void *userdata) int result; struct stat64 buffer; /* buffer for storing file info */ char sum[65]; /* buffer for checksum */ + char *file; + if (hexchat_get_prefs (ph, "dcc_completed_dir", &file, NULL) == 1 && file[0] != 0) + { + file = g_strconcat (file, G_DIR_SEPARATOR_S, word[1], NULL); + } + else + { + file = g_strdup(word[2]); + } - result = stat64 (word[2], &buffer); + result = stat64 (file, &buffer); if (result == 0) /* stat returns 0 on success */ { if (buffer.st_size <= (unsigned long long) get_limit () * 1048576) { - sha256_file (word[2], sum); /* word[2] is the full filename */ + sha256_file (file, sum); /* file is the full filename even if completed dir set */ /* try to print the checksum in the privmsg tab of the sender */ hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3])); hexchat_printf (ph, "SHA-256 checksum for %s (local): %s\n", word[1], sum); @@ -195,6 +204,7 @@ dccrecv_cb (char *word[], void *userdata) hexchat_printf (ph, "File access error!\n"); } + g_free (file); return HEXCHAT_EAT_NONE; } diff --git a/win32/spelling/hexchat-spelling.skel.iss b/win32/spelling/hexchat-spelling.skel.iss index e691c17b..a921adc2 100644 --- a/win32/spelling/hexchat-spelling.skel.iss +++ b/win32/spelling/hexchat-spelling.skel.iss @@ -8,7 +8,7 @@ AppPublisherURL=http://www.hexchat.org/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny AppSupportURL=https://github.com/hexchat/hexchat/issues AppUpdatesURL=http://www.hexchat.org/home/downloads -DefaultDirName={userappdata}\enchant +DefaultDirName={localappdata}\enchant DefaultGroupName=HexChat DisableProgramGroupPage=yes DisableDirPage=yes |