Skip to content

Commit b21f48e

Browse files
committed
[issue-4555]: fixed
Signed-off-by: Vadim Kalinnikov <[email protected]>
1 parent 6c4e687 commit b21f48e

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/usermenu.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
Written by:
88
Slava Zanko <[email protected]>, 2013
99
Andrew Borodin <[email protected]>, 2013
10+
Vadim Kalinnikov <[email protected]>, 2025
1011
1112
This file is part of the Midnight Commander.
1213
@@ -1042,6 +1043,8 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
10421043

10431044
old_patterns = easy_patterns;
10441045

1046+
gboolean found_default = FALSE;
1047+
10451048
// Parse the menu file
10461049
for (p = check_patterns (data); *p != '\0'; str_next_char (&p))
10471050
{
@@ -1063,8 +1066,11 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
10631066
{
10641067
// Combined adding and default
10651068
p = test_line (edit_widget, p + 1, &accept_entry);
1066-
if (selected == 0 && accept_entry)
1069+
if (!found_default && accept_entry)
1070+
{
10671071
selected = menu_lines;
1072+
found_default = TRUE;
1073+
}
10681074
}
10691075
else
10701076
{
@@ -1078,17 +1084,23 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
10781084
{
10791085
// Combined adding and default
10801086
p = test_line (edit_widget, p + 1, &accept_entry);
1081-
if (selected == 0 && accept_entry)
1082-
selected = menu_lines;
1087+
if (!found_default && accept_entry)
1088+
{
1089+
selected = menu_lines;
1090+
found_default = TRUE;
1091+
}
10831092
}
10841093
else
10851094
{
10861095
// A condition for making the entry default
10871096
gboolean ok = TRUE;
10881097

10891098
p = test_line (edit_widget, p, &ok);
1090-
if (selected == 0 && ok)
1099+
if (!found_default && ok)
1100+
{
10911101
selected = menu_lines;
1102+
found_default = TRUE;
1103+
}
10921104
}
10931105
break;
10941106

0 commit comments

Comments
 (0)