diff options
| -rw-r--r-- | main.cpp | 10 | ||||
| -rw-r--r-- | messages.cpp | 9 |
2 files changed, 11 insertions, 8 deletions
@@ -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); 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: "; |