1 files changed, 9 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 83e10ab..b0d929a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -161,8 +161,17 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  MessageBox(0, _T("Set path to gpg.exe first!"), _T("Warning"), MB_OK);				  
 				  break;
 			  }
+			  string::size_type s = 0;
+			  while((s = out.find("\r", s)) != string::npos)
+			  {
+				  out.erase(s, 1);
+			  }
 			  DBWriteContactSettingString(NULL, szModuleName, "GPGPubKey", out.c_str());
 		  }
+		  TCHAR passwd[64];
+		  GetDlgItemText(hwndDlg, IDC_KEY_PASSWORD, passwd, 64);
+		  if(_tcslen(passwd) > 0)
+			  DBWriteContactSettingTString(NULL, szModuleName, "szKeyPassword", passwd);
 		  DBWriteContactSettingByte(NULL, szModuleName, "FirstRun", 0);
 		  DestroyWindow(hwndDlg);
 		  break;
@@ -183,10 +192,6 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
       switch (((LPNMHDR)lParam)->code)
       {
         
-      case PSN_APPLY:
-        {
-          return TRUE;
-        }
       }
 	}
 	break;