backported fix from miranda ng

1 files changed, 8 insertions, 7 deletions

diff --git a/main.cpp b/main.cpp
index db7a6d7..4c7d980 100755
--- a/main.cpp
+++ b/main.cpp
@@ -249,6 +249,14 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 					  acc_str += "_KeyID";
 					  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), fp);
 				  }
+				  if(!strcmp(buf, Translate("Default")))
+				  {
+					  wstring keyinfo = TranslateT("Default private key id");
+					  keyinfo += _T(": ");
+					  keyinfo += (fp[0])?fp:_T("not set");
+					  extern HWND hwndCurKey_p;
+					  SetWindowText(hwndCurKey_p, keyinfo.c_str());
+				  }
 			  }
 			  TCHAR passwd[64];
 			  GetDlgItemText(hwndDlg, IDC_KEY_PASSWORD, passwd, 64);
@@ -261,13 +269,6 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  dbsetting += "_Password";
 				  DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), passwd);
 			  }
-			  {
-				  wstring keyinfo = TranslateT("Default private key id");
-				  keyinfo += _T(": ");
-				  keyinfo += (fp[0])?fp:_T("not set");
-				  extern HWND hwndCurKey_p;
-				  SetWindowText(hwndCurKey_p, keyinfo.c_str());
-			  }
 			  delete [] name;
 		  }
 		  bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");