Skip to content

Commit 9c604a2

Browse files
committed
Preserve Explore location on close content hotkey
1 parent e2ff006 commit 9c604a2

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

menu/menu_driver.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8021,16 +8021,19 @@ int generic_menu_entry_action(
80218021
if (string_is_empty(parent_label))
80228022
continue;
80238023

8024-
/* If core was launched via a playlist, flush
8024+
/* If core was launched via a playlist or Explore, flush
80258025
* to playlist entry menu */
8026-
if ( string_is_equal(parent_label,
8027-
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS))
8028-
&& (!string_is_empty(deferred_path)
8029-
&& !string_is_empty(content_path)
8030-
&& string_is_equal(deferred_path, content_path))
8031-
)
8026+
if ( ( string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS))
8027+
|| string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_EXPLORE_TAB)))
8028+
&& (!string_is_empty(deferred_path)
8029+
&& !string_is_empty(content_path)
8030+
&& string_is_equal(deferred_path, content_path))
8031+
)
80328032
{
8033-
flush_target = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS);
8033+
if (string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_EXPLORE_TAB)))
8034+
flush_target = msg_hash_to_str(MENU_ENUM_LABEL_EXPLORE_TAB);
8035+
else
8036+
flush_target = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS);
80348037
break;
80358038
}
80368039
/* If core was launched via 'Contentless Cores' menu,

0 commit comments

Comments
 (0)