modified: main.cpp

	modified:   messages.cpp

1 files changed, 5 insertions, 4 deletions

diff --git a/messages.cpp b/messages.cpp
index 4b4a686..3c481f8 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -890,14 +890,15 @@ int HookSendMsg(WPARAM w, LPARAM l)
 
 static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	char *inkeyid = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "InKeyID", "");
-	new_key_hcnt_mutex.unlock();
-	TCHAR *tmp = NULL;
-	
+	char *inkeyid = NULL;
   switch (msg)
   {
   case WM_INITDIALOG:
     {
+		char *inkeyid = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "InKeyID", "");
+		new_key_hcnt_mutex.unlock();
+		TCHAR *tmp = NULL;
+
 		SetWindowPos(hwndDlg, 0, key_password_rect.left, key_password_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
 		string questionstr = "Please enter password for key with ID: ";