Fix merge conflicts

This commit is contained in:
Thamatip Chitpong 2024-05-13 23:25:15 +07:00 committed by GitHub
parent a290e3606a
commit fd303d2819
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -479,7 +479,7 @@ CMainWindow::ShowAboutDlg()
VOID
CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam)
{
BOOL bReload = TRUE;
const BOOL bReload = TRUE;
WORD wCommand = LOWORD(wParam);
if (!lParam)
@ -536,7 +536,6 @@ CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam)
break;
case ID_REFRESH:
bReload = IsInstalledEnum(SelectedEnumType); // Force installed refresh from the registry
UpdateApplicationsList(SelectedEnumType, bReload);
break;