User menu: select first item that matches the condition, not second #4725
+4
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
needs triage
zyv
changed the title
zyv
added
area: core
|
I have cleaned up this PR to the best of my ability... |
|
On Tue, 24 Jun 2025 22:14:20 -0700 "Yury V. Zaytsev" ***@***.***> wrote:
@zyv requested your review on: MidnightCommander/mc#4725 User menu: select first item that matches the condition, not second.
In the patch, two variables are changed together in all three cases:
```
selected = menu_lines;
found_default = TRUE;
```
I think, only `selected` is enough: negative value for `found_default == FALSE` and zero or positive value for `found_default == TRUE`.
The following patch is working for me for the testcase in the starting post:
```
diff --git a/src/usermenu.c b/src/usermenu.c
index 81e1158f7..37c933f5a 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -986,7 +986,7 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
int max_cols = 0;
int col = 0;
gboolean accept_entry = TRUE;
- int selected = 0;
+ int selected = -1;
gboolean old_patterns;
gboolean res = FALSE;
gboolean interactive = TRUE;
@@ -1063,7 +1063,7 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
{
// Combined adding and default
p = test_line (edit_widget, p + 1, &accept_entry);
- if (selected == 0 && accept_entry)
+ if (selected < 0 && accept_entry)
selected = menu_lines;
}
else
@@ -1078,7 +1078,7 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
{
// Combined adding and default
p = test_line (edit_widget, p + 1, &accept_entry);
- if (selected == 0 && accept_entry)
+ if (selected < 0 && accept_entry)
selected = menu_lines;
}
else
@@ -1087,7 +1087,7 @@ user_menu_cmd (const Widget *edit_widget, const char *menu_file, int selected_en
gboolean ok = TRUE;
p = test_line (edit_widget, p, &ok);
- if (selected == 0 && ok)
+ if (selected < 0 && ok)
selected = menu_lines;
}
break;
```
|
zyv
approved these changes
Jun 29, 2025
There was a problem hiding this comment.
@aborodin, I guess this is better. I have updated the PR again.
@moose-kazan, could you please test and confirm that it works for you?
|
Yes. Patch from @aborodin solve this issue. |
|
/rebase |
…ondition, not second Signed-off-by: Andrew Borodin <[email protected]> Signed-off-by: Yury V. Zaytsev <[email protected]>
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #4555 (I hope ;-))