merged with miranda_ng main repo

1 files changed, 2 insertions, 10 deletions

diff --git a/main.cpp b/main.cpp
index a38ff2d..be2fe51 100755
--- a/main.cpp
+++ b/main.cpp
@@ -888,20 +888,12 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		{
 			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", (SHGetValue(HKEY_CURRENT_USER, _T("Software\\GNU\\GnuPG"), _T("gpgProgram"), 0, path, &len) == ERROR_SUCCESS)?path:_T(""));
 			if(tmp[0])
-			{
 				if(!boost::filesystem::exists(tmp))

-				{
 					MessageBox(0, TranslateT("wrong gpg binary location found in system.\nplease choose another location"), TranslateT("Warning"), MB_OK);

-				}
-/*				char *mir_path = (char*)mir_alloc(MAX_PATH);

-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);

-				SetCurrentDirectoryA(mir_path);

-				mir_free(mir_path); */

-			}
 		}
-		else
-			tmp = mir_wstrdup(path);
+		else tmp = mir_wstrdup(path);
 		mir_free(path);

+
 		SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
 		bool bad_version = false;
 		if(gpg_exists/* && lang_exists*/)