From ab1dfe7f619cb1e546e0669743b8fa9a23f0f347 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sat, 11 Feb 2023 18:53:31 +0100 Subject: [Dmenu] Small fix that disabled async mode when multi-select is enabled. --- source/modes/dmenu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/modes/dmenu.c b/source/modes/dmenu.c index 0b604e78..c9b55d10 100644 --- a/source/modes/dmenu.c +++ b/source/modes/dmenu.c @@ -514,6 +514,7 @@ static int dmenu_mode_init(Mode *sw) { DmenuModePrivateData *pd = (DmenuModePrivateData *)mode_get_private_data(sw); pd->async = TRUE; + pd->multi_select = FALSE; // For now these only work in sync mode. if (find_arg("-sync") >= 0 || find_arg("-dump") >= 0 || @@ -522,6 +523,10 @@ static int dmenu_mode_init(Mode *sw) { find_arg("-selected-row") >= 0) { pd->async = FALSE; } + if ( find_arg("-multi-select") >= 0 ) { + pd->multi_select = TRUE; + pd->async = FALSE; + } pd->separator = '\n'; pd->selected_line = UINT32_MAX; @@ -907,14 +912,11 @@ int dmenu_mode_dialog(void) { DmenuScriptEntry *cmd_list = pd->cmd_list; pd->only_selected = FALSE; - pd->multi_select = FALSE; pd->ballot_selected = "☑ "; pd->ballot_unselected = "☐ "; find_arg_str("-ballot-selected-str", &(pd->ballot_selected)); find_arg_str("-ballot-unselected-str", &(pd->ballot_unselected)); - if (find_arg("-multi-select") >= 0) { - pd->multi_select = TRUE; - } + if (find_arg("-markup-rows") >= 0) { pd->do_markup = TRUE; } -- cgit v1.2.3