diff options
Diffstat (limited to 'options.cpp')
| -rwxr-xr-x | options.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/options.cpp b/options.cpp index 99b99e7..63cccf5 100755 --- a/options.cpp +++ b/options.cpp @@ -278,7 +278,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP gpg_thread.~thread(); TerminateProcess(params.hProcess, 1); params.hProcess = NULL; - debuglog<<time_str()<<": GPG execution timed out, aborted\n"; + debuglog<<std::string(time_str()+": GPG execution timed out, aborted"); mir_free(tmp); break; } @@ -463,7 +463,13 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP if(bDebugLog) debuglog.init(); bJabberAPI = CheckStateStoreDB(hwndDlg, IDC_JABBER_API, "bJabberAPI"); + bool old_bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 0); bFileTransfers = CheckStateStoreDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers"); + if(bFileTransfers != old_bFileTransfers) + { + DBWriteContactSettingByte(NULL, szGPGModuleName, "bSameAction", 0); + bSameAction = false; + } bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange"); { TCHAR tmp[512]; @@ -838,7 +844,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam gpg_thread.~thread(); TerminateProcess(params.hProcess, 1); params.hProcess = NULL; - debuglog<<time_str()<<": GPG execution timed out, aborted\n"; + debuglog<<std::string(time_str()+": GPG execution timed out, aborted"); } if((out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----") != string::npos) && (out.find("-----END PGP PUBLIC KEY BLOCK-----") != string::npos)) { @@ -991,7 +997,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam gpg_thread.~thread(); TerminateProcess(params.hProcess, 1); params.hProcess = NULL; - debuglog<<time_str()<<": GPG execution timed out, aborted\n"; + debuglog<<std::string(time_str()+": GPG execution timed out, aborted"); break; } if(result == pxNotFound) @@ -1238,7 +1244,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam gpg_thread.~thread(); TerminateProcess(params.hProcess, 1); params.hProcess = NULL; - debuglog<<time_str()<<": GPG execution timed out, aborted\n"; + debuglog<<std::string(time_str()+": GPG execution timed out, aborted"); break; } if(result == pxNotFound) @@ -1325,7 +1331,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam if(key_buf.empty()) { key_buf.clear(); - debuglog<<time_str()<<": info: Failed to read key file\n"; + debuglog<<std::string(time_str()+": info: Failed to read key file"); break; } ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----")); |