fix(radio): a Lua script GF/SF continues to run after function changed (#5499)
This commit is contained in:
@@ -220,7 +220,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
|||||||
if (CFN_SWITCH(cfn)) {
|
if (CFN_SWITCH(cfn)) {
|
||||||
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN, y, funcGetLabel(func), attr);
|
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN, y, funcGetLabel(func), attr);
|
||||||
if (active) {
|
if (active) {
|
||||||
CFN_FUNC(cfn) = cfn_sorted[checkIncDec(event, getFuncSortIdx(CFN_FUNC(cfn)), 0, FUNC_MAX-1, eeFlags, isAssignableFunctionAvailableSorted)];
|
Functions newFunc = cfn_sorted[checkIncDec(event, getFuncSortIdx(CFN_FUNC(cfn)), 0, FUNC_MAX-1, eeFlags, isAssignableFunctionAvailableSorted)];
|
||||||
|
// If changing from Lua script then reload to remove old reference
|
||||||
|
if ((CFN_FUNC(cfn) == FUNC_PLAY_SCRIPT || CFN_FUNC(cfn) == FUNC_RGB_LED) && newFunc != FUNC_PLAY_SCRIPT && newFunc != FUNC_RGB_LED)
|
||||||
|
LUA_LOAD_MODEL_SCRIPTS();
|
||||||
|
CFN_FUNC(cfn) = newFunc;
|
||||||
if (checkIncDec_Ret) CFN_RESET(cfn);
|
if (checkIncDec_Ret) CFN_RESET(cfn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -212,7 +212,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
|||||||
if (CFN_SWITCH(cfn)) {
|
if (CFN_SWITCH(cfn)) {
|
||||||
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN, y, funcGetLabel(func), attr);
|
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN, y, funcGetLabel(func), attr);
|
||||||
if (active) {
|
if (active) {
|
||||||
func = CFN_FUNC(cfn) = cfn_sorted[checkIncDec(event, getFuncSortIdx(CFN_FUNC(cfn)), 0, FUNC_MAX-1, eeFlags, isAssignableFunctionAvailableSorted)];
|
Functions newFunc = cfn_sorted[checkIncDec(event, getFuncSortIdx(CFN_FUNC(cfn)), 0, FUNC_MAX-1, eeFlags, isAssignableFunctionAvailableSorted)];
|
||||||
|
// If changing from Lua script then reload to remove old reference
|
||||||
|
if ((CFN_FUNC(cfn) == FUNC_PLAY_SCRIPT || CFN_FUNC(cfn) == FUNC_RGB_LED) && newFunc != FUNC_PLAY_SCRIPT && newFunc != FUNC_RGB_LED)
|
||||||
|
LUA_LOAD_MODEL_SCRIPTS();
|
||||||
|
func = CFN_FUNC(cfn) = newFunc;
|
||||||
if (checkIncDec_Ret) CFN_RESET(cfn);
|
if (checkIncDec_Ret) CFN_RESET(cfn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -652,14 +652,18 @@ void FunctionEditPage::buildBody(Window *form)
|
|||||||
line = form->newLine(grid);
|
line = form->newLine(grid);
|
||||||
new StaticText(line, rect_t{}, STR_FUNC);
|
new StaticText(line, rect_t{}, STR_FUNC);
|
||||||
auto functionChoice =
|
auto functionChoice =
|
||||||
new Choice(line, rect_t{}, 0, FUNC_MAX - 1, GET_DEFAULT(getFuncSortIdx(CFN_FUNC(cfn))));
|
new Choice(line, rect_t{}, 0, FUNC_MAX - 1, GET_DEFAULT(getFuncSortIdx(CFN_FUNC(cfn))),
|
||||||
|
[=](int32_t newValue) {
|
||||||
|
Functions newFunc = cfn_sorted[newValue];
|
||||||
|
// If changing from Lua script then reload to remove old reference
|
||||||
|
if ((CFN_FUNC(cfn) == FUNC_PLAY_SCRIPT || CFN_FUNC(cfn) == FUNC_RGB_LED) && newFunc != FUNC_PLAY_SCRIPT && newFunc != FUNC_RGB_LED)
|
||||||
|
LUA_LOAD_MODEL_SCRIPTS();
|
||||||
|
CFN_FUNC(cfn) = newFunc;
|
||||||
|
CFN_RESET(cfn);
|
||||||
|
SET_DIRTY();
|
||||||
|
updateSpecialFunctionOneWindow();
|
||||||
|
});
|
||||||
functionChoice->setTextHandler([=](int val) { return funcGetLabel(cfn_sorted[val]); });
|
functionChoice->setTextHandler([=](int val) { return funcGetLabel(cfn_sorted[val]); });
|
||||||
functionChoice->setSetValueHandler([=](int32_t newValue) {
|
|
||||||
CFN_FUNC(cfn) = cfn_sorted[newValue];
|
|
||||||
CFN_RESET(cfn);
|
|
||||||
SET_DIRTY();
|
|
||||||
updateSpecialFunctionOneWindow();
|
|
||||||
});
|
|
||||||
functionChoice->setAvailableHandler(
|
functionChoice->setAvailableHandler(
|
||||||
[=](int value) { return isAssignableFunctionAvailable(cfn_sorted[value]); });
|
[=](int value) { return isAssignableFunctionAvailable(cfn_sorted[value]); });
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user