Skip to content

Commit 4e8241f

Browse files
authored
fix(player): UseMenuAction crash (#89)
2 parents 92ee86c + b2ea315 commit 4e8241f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/plugins/core/scripting/player/player.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,13 +468,18 @@ void PluginPlayer::PerformMenuAction(std::string action, int value)
468468
if (!self) return;
469469

470470
if (action == "useOption") {
471+
if(!self->menu_renderer->HasMenuShown()) return;
472+
if(self->menu_renderer->GetMenu()->GetItemsOnPage(self->menu_renderer->GetPage()) < value) return;
471473
while (self->menu_renderer->GetSelection() != value - 1)
472474
self->menu_renderer->MoveSelection();
473475

474476
self->menu_renderer->PerformMenuAction(g_Config->FetchValue<std::string>("core.menu.buttons.use"));
475477
}
476478
else if (action == "scrollToOption") {
479+
if(!self->menu_renderer->HasMenuShown()) return;
480+
if(self->menu_renderer->GetMenu()->GetItemsOnPage(self->menu_renderer->GetPage()) < value) return;
481+
477482
while (self->menu_renderer->GetSelection() != value - 1)
478483
self->menu_renderer->MoveSelection();
479484
}
480-
}
485+
}

0 commit comments

Comments
 (0)