Skip to content

Commit 0dae3f7

Browse files
committed
Fix dialog text disappearing for No-AV dialog
The text for the checkbox is in a separate control, which gets pushed to the back on user interaction with the checkbox
1 parent bc3121e commit 0dae3f7

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Client/loader/Dialogs.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ const SDialogItemInfo g_NoAvDialogItems[] = {
101101
_td("MTA could not detect an anti-virus on your PC.\n\n"
102102
"Viruses interfere with MTA and degrade your gameplay experience.\n\n"
103103
"Press 'Help' for more information.")},
104-
{IDC_NOAV_OPT_SKIP, 0, _td("I have already installed an anti-virus")},
105-
{IDC_NOAV_OPT_BOTNET, 0,
104+
{IDC_NOAV_OPT_SKIP, 1, _td("I have already installed an anti-virus")},
105+
{IDC_NOAV_OPT_BOTNET, 1,
106106
_td("I will not install an anti-virus.\n"
107107
"I want my PC to lag and be part of a botnet.")},
108108
{IDC_BUTTON_HELP, 0, dialogStringsHelp},
@@ -618,8 +618,12 @@ void ShowNoAvDialog(HINSTANCE hInstance, bool bEnableScaremongering)
618618
hwndNoAvDialog = CreateDialogW(hInstance, MAKEINTRESOURCEW(IDD_NOAV_DIALOG), 0, DialogProc);
619619
dassert((GetWindowLongW(hwndNoAvDialog, GWL_STYLE) & WS_VISIBLE) == 0); // Should be Visible: False
620620
InitDialogStrings(hwndNoAvDialog, g_NoAvDialogItems);
621-
ShowWindow(GetDlgItem(hwndNoAvDialog, IDC_NOAV_OPT_SKIP), bEnableScaremongering ? SW_HIDE : SW_SHOW);
622-
ShowWindow(GetDlgItem(hwndNoAvDialog, IDC_NOAV_OPT_BOTNET), bEnableScaremongering ? SW_SHOW : SW_HIDE);
621+
const int textSourceItemId = bEnableScaremongering ? IDC_NOAV_OPT_BOTNET : IDC_NOAV_OPT_SKIP;
622+
{
623+
wchar_t text[256] = {};
624+
GetWindowTextW(GetDlgItem(hwndNoAvDialog, textSourceItemId), text, _countof(text));
625+
SetWindowTextW(GetDlgItem(hwndNoAvDialog, IDC_CHECK_NOT_AGAIN), text);
626+
}
623627
}
624628
ShowWindow(hwndNoAvDialog, SW_SHOW); // Show after all changes are complete
625629
SetForegroundWindow(hwndNoAvDialog);

0 commit comments

Comments
 (0)