mirror of
https://github.com/reactos/reactos.git
synced 2024-06-01 18:21:50 +00:00
Fix merge conflicts
This commit is contained in:
parent
a290e3606a
commit
fd303d2819
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue