preserve menu sort between 'O' commands in same instance
Also, only execute the change settings loop when the menu response was > 0
This commit is contained in:
13
src/botl.c
13
src/botl.c
@@ -1031,13 +1031,14 @@ char *opts;
|
|||||||
void
|
void
|
||||||
cond_menu(VOID_ARGS)
|
cond_menu(VOID_ARGS)
|
||||||
{
|
{
|
||||||
int i, res, idx = 0, sortorder = 0;
|
static int sortorder = 0;
|
||||||
|
static const char *menutitle[2] = { "alphabetically", "by ranking"};
|
||||||
|
int i, res, idx = 0;
|
||||||
int sequence[CONDITION_COUNT];
|
int sequence[CONDITION_COUNT];
|
||||||
winid tmpwin;
|
winid tmpwin;
|
||||||
anything any;
|
anything any;
|
||||||
menu_item *picks = (menu_item *) 0;
|
menu_item *picks = (menu_item *) 0;
|
||||||
char mbuf[QBUFSZ];
|
char mbuf[QBUFSZ];
|
||||||
static const char *menutitle[2] = { "alphabetically", "by ranking"};
|
|
||||||
boolean showmenu = TRUE;
|
boolean showmenu = TRUE;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@@ -1095,9 +1096,11 @@ cond_menu(VOID_ARGS)
|
|||||||
}
|
}
|
||||||
} while (showmenu);
|
} while (showmenu);
|
||||||
|
|
||||||
for (i = 0; i < CONDITION_COUNT; ++i) {
|
if (res > 0) {
|
||||||
if (condtests[i].enabled != condtests[i].choice)
|
for (i = 0; i < CONDITION_COUNT; ++i) {
|
||||||
condtests[i].enabled = condtests[i].choice;
|
if (condtests[i].enabled != condtests[i].choice)
|
||||||
|
condtests[i].enabled = condtests[i].choice;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user