From 1a991b244f308faabed63c60cd18a54c6b63f805 Mon Sep 17 00:00:00 2001 From: digant73 Date: Mon, 1 Dec 2025 22:29:48 +0100 Subject: [PATCH] fix wrong resolved conflict --- rpcs3/rpcs3qt/game_list_frame.cpp | 7 +++---- rpcs3/rpcs3qt/game_list_frame.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 7c33dd32ef..9b4224e472 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -1373,7 +1373,7 @@ void game_list_frame::ShowSingleSelectionContextMenu(const game_info& gameinfo, // Manage Game menu QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game")); - // Create game shortcut + // Create game shortcuts QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut")); connect(create_desktop_shortcut, &QAction::triggered, this, [this, gameinfo]() { @@ -1918,7 +1918,7 @@ void game_list_frame::ShowMultiSelectionContextMenu(const std::vector // Manage Game menu QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game")); - // Create game shortcut + // Create game shortcuts QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut")); connect(create_desktop_shortcut, &QAction::triggered, this, [this, games]() { @@ -2079,8 +2079,7 @@ void game_list_frame::ClearContentList(bool refresh) serials_to_remove_from_yml.push_back(removedDisc); } - // Finally, refresh the game list. - // Hidden list in "GuiConfigs/CurrentSettings.ini" file is also properly updated (title removed) if needed + // Finally, refresh the game list Refresh(true, serials_to_remove_from_yml); } diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index 6c95e44d95..e5e4ee3b49 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -110,8 +110,8 @@ public Q_SLOTS: // void SetContentList(u16 content_types, const content_info& content_info); void BatchRemoveContentLists(const std::vector& games = {}, bool is_interactive = false); - - void SetListMode(const bool& is_list); + + void SetListMode(bool is_list); void SetSearchText(const QString& text); void SetShowCompatibilityInGrid(bool show); void SetPreferGameDataIcons(bool enabled);