Skip to content

Commit

Permalink
MenuActionBar: Fixed a crash on clear() when slots weren't defined
Browse files Browse the repository at this point in the history
  • Loading branch information
dorkster committed Aug 23, 2024
1 parent 9155a4a commit fba650a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions RELEASE_NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Engine fixes:
* Fixed the direction of moving powers when the origin and target are the same point.
* Fixed cases where parts of WidgetSlider were being drawn outside the visible area.
* Fixed infinite INCLUDE recursion in FileParser.
* Fixed a crash when action bar slots weren't defined.
* Android: Fix 'Flare' directory not being automatically created.
* Android: Added a dialog to direct the player to the wiki page for installing if no game data is found.

Expand Down
3 changes: 2 additions & 1 deletion src/MenuActionBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ void MenuActionBar::clear(bool skip_items) {
slot_activated[i] = false;
slot_fail_cooldown[i] = 0;

slots[i]->enabled = true;
if (slots[i])
slots[i]->enabled = true;
}

// clear menu notifications
Expand Down
2 changes: 1 addition & 1 deletion src/Version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ FLARE. If not, see http://www.gnu.org/licenses/

#include <SDL.h>

Version VersionInfo::ENGINE(1, 14, 46);
Version VersionInfo::ENGINE(1, 14, 47);
Version VersionInfo::MIN(0, 0, 0);
Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);

Expand Down

0 comments on commit fba650a

Please sign in to comment.