modified: main.cpp

	modified:   messages.cpp

1 files changed, 6 insertions, 4 deletions

diff --git a/main.cpp b/main.cpp
index 7fdf27c..e75ec4d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -989,14 +989,15 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 {
 	extern HANDLE new_key_hcnt;
 	extern boost::mutex new_key_hcnt_mutex;
-	HANDLE hContact = new_key_hcnt;
-	new_key_hcnt_mutex.unlock();
+	HANDLE hContact = INVALID_HANDLE_VALUE;
 	void ImportKey();
 	TCHAR *tmp = NULL;
   switch (msg)
   {
   case WM_INITDIALOG:
     {
+		hContact = new_key_hcnt;
+		new_key_hcnt_mutex.unlock();
 		SetWindowPos(hwndDlg, 0, new_key_rect.left, new_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
 		TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
@@ -1622,12 +1623,13 @@ static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 {
   extern HANDLE new_key_hcnt;
   extern boost::mutex new_key_hcnt_mutex;
-  HANDLE hContact = new_key_hcnt;
-  new_key_hcnt_mutex.unlock();
+  HANDLE hContact = INVALID_HANDLE_VALUE;
   switch (msg)
   {
   case WM_INITDIALOG:
     {
+		hContact = new_key_hcnt;
+		new_key_hcnt_mutex.unlock();
 		SetWindowPos(hwndDlg, 0 , import_key_rect.left, import_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEYSERVER), _T("subkeys.pgp.net"), 0);