Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ACTION_ITEM with nullptr #23195

Merged
merged 2 commits into from
Dec 8, 2021
Merged

Fix ACTION_ITEM with nullptr #23195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa475e
Fix menu nullptr dereference when SD not inserted
sjasonsmith Nov 25, 2021
90846b1
Fix MenuItem_function for nullptr
thinkyhead Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/lcd/menu/menu_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class MenuItem_button : public MenuItemBase {
class MenuItem_function : public MenuItem_button {
public:
//static inline void action(PGM_P const, const uint8_t, const menuAction_t func) { (*func)(); };
static inline void action(PGM_P const, const menuAction_t func) { (*func)(); };
static inline void action(PGM_P const, const menuAction_t func) { if (func) (*func)(); };
};

// GCODES_ITEM(LABEL, GCODES)
Expand Down