Tera TermRevision: 7729
https://osdn.net/projects/ttssh2/scm/svn/commits/7729
Author: zmatsuo
Date: 2019-06-05 23:15:34 +0900 (Wed, 05 Jun 2019)
Log Message:
-----------
TTSSH Authentication Setup ダイアログuser nameラジオボタンを修正
- ラジオボタンのグループ化に誤り修正
- DefaultUserNameが空の時、初期化の誤りを修正
Modified Paths:
--------------
trunk/ttssh2/ttxssh/auth.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2019-06-05 10:22:24 UTC (rev 7728)
+++ trunk/ttssh2/ttxssh/auth.c 2019-06-05 14:15:34 UTC (rev 7729)
@@ -1521,9 +1521,10 @@
CheckDlgButton(dlg, IDC_CHECKAUTH, TRUE);
}
- if (pvar->session_settings.DefaultUserName[0] == 0) {
+ if (pvar->settings.DefaultUserType == 1 &&
+ pvar->session_settings.DefaultUserName[0] == 0) {
// \x8B\xF3\x82Ȃ̂Łu\x93\xFC\x97͂\xB5\x82Ȃ\xA2\x81v\x82ɂ\xB5\x82Ă\xA8\x82\xAD
- pvar->session_settings.DefaultUserType = 0;
+ pvar->settings.DefaultUserType = 0;
}
id = pvar->settings.DefaultUserType == 1 ? IDC_SSH_DEFAULTUSERNAME :
pvar->settings.DefaultUserType == 2 ? IDC_SSH_WINDOWS_USERNAME :
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2019-06-05 10:22:24 UTC (rev 7728)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2019-06-05 14:15:34 UTC (rev 7729)
@@ -218,10 +218,10 @@
BEGIN
LTEXT "Select defaults for authentication:",IDC_SSHAUTHBANNER,6,7,166,10
GROUPBOX "User name",IDC_STATIC,6,22,295,88
- CONTROL "&Do not enter username",IDC_SSH_NO_USERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,35,152,10
+ CONTROL "&Do not enter username",IDC_SSH_NO_USERNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,19,35,152,10
CONTROL "U&se following username",IDC_SSH_DEFAULTUSERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,50,152,10
CONTROL "Us&e system username",IDC_SSH_WINDOWS_USERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,78,152,10
- EDITTEXT IDC_SSHUSERNAME,35,62,145,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_SSHUSERNAME,35,62,145,12,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Current username is ""%s""",IDC_SSH_WINDOWS_USERNAME_TEXT,35,93,128,10
GROUPBOX "Authentication methods ",IDC_STATIC,6,120,295,200
CONTROL "Use p&lain password to log in",IDC_SSHUSEPASSWORD,