diff --git a/rpcs3/Emu/GameInfo.h b/rpcs3/Emu/GameInfo.h index 5fec2b637e..3efca1410a 100644 --- a/rpcs3/Emu/GameInfo.h +++ b/rpcs3/Emu/GameInfo.h @@ -9,12 +9,12 @@ struct GameInfo std::string icon_path; std::string movie_path; - std::string name = "Unknown"; - std::string serial = "Unknown"; - std::string app_ver = "Unknown"; - std::string version = "Unknown"; - std::string category = "Unknown"; - std::string fw = "Unknown"; + std::string name; + std::string serial; + std::string app_ver; + std::string version; + std::string category; + std::string fw; u32 attr = 0; u32 bootable = 0; diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 3cd39a267f..3d1691e3e1 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -497,6 +497,7 @@ void game_list_frame::OnParsingFinished() game.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1); game.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables game.version = utils::get_firmware_version(); + game.app_ver = game.version; game.fw = game.version; game.bootable = 1; game.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png"; @@ -516,7 +517,7 @@ void game_list_frame::OnParsingFinished() } } - if (game.name == "Unknown") + if (game.name.empty()) { game.name = game.serial; } diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index bb0b5eca20..447dee3125 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -66,7 +66,7 @@ void pad_settings_dialog::pad_button::insert_key(const std::string& key, bool ap text = QString::fromStdString(keys).replace(",", ", "); } -pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_settings, QWidget *parent, const GameInfo *game) +pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_settings, QWidget* parent, const GameInfo* game) : QDialog(parent) , ui(new Ui::pad_settings_dialog) , m_gui_settings(std::move(gui_settings)) diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h index 2a4f15959f..2c63eda3f0 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.h +++ b/rpcs3/rpcs3qt/pad_settings_dialog.h @@ -89,7 +89,7 @@ class pad_settings_dialog : public QDialog const QString Disconnected_suffix = tr(" (disconnected)"); public: - explicit pad_settings_dialog(std::shared_ptr gui_settings, QWidget *parent = nullptr, const GameInfo *game = nullptr); + explicit pad_settings_dialog(std::shared_ptr gui_settings, QWidget* parent = nullptr, const GameInfo* game = nullptr); ~pad_settings_dialog(); private Q_SLOTS: diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index b67926387e..f261247957 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -92,7 +92,7 @@ void remove_item(QComboBox* box, int data_value, int def_value) extern const std::map g_prx_list; -settings_dialog::settings_dialog(std::shared_ptr gui_settings, std::shared_ptr emu_settings, const int& tab_index, QWidget *parent, const GameInfo* game) +settings_dialog::settings_dialog(std::shared_ptr gui_settings, std::shared_ptr emu_settings, const int& tab_index, QWidget* parent, const GameInfo* game) : QDialog(parent) , m_tab_index(tab_index) , ui(new Ui::settings_dialog) diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h index a377811c18..29a15346be 100644 --- a/rpcs3/rpcs3qt/settings_dialog.h +++ b/rpcs3/rpcs3qt/settings_dialog.h @@ -21,7 +21,7 @@ class settings_dialog : public QDialog Q_OBJECT public: - explicit settings_dialog(std::shared_ptr gui_settings, std::shared_ptr emu_settings, const int& tab_index = 0, QWidget *parent = nullptr, const GameInfo *game = nullptr); + explicit settings_dialog(std::shared_ptr gui_settings, std::shared_ptr emu_settings, const int& tab_index = 0, QWidget* parent = nullptr, const GameInfo* game = nullptr); ~settings_dialog(); int exec() override; Q_SIGNALS: