diff options
Diffstat (limited to 'src/yuzu/main.h')
| -rw-r--r-- | src/yuzu/main.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 366e806d5..280fae5c3 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -16,6 +16,7 @@ #include "common/announce_multiplayer_room.h" #include "common/common_types.h" #include "configuration/qt_config.h" +#include "frontend_common/content_manager.h" #include "input_common/drivers/tas_input.h" #include "yuzu/compatibility_list.h" #include "yuzu/hotkeys.h" @@ -124,13 +125,6 @@ enum class EmulatedDirectoryTarget { SDMC, }; -enum class InstallResult { - Success, - Overwrite, - Failure, - BaseInstallAttempted, -}; - enum class ReinitializeKeyBehavior { NoWarning, Warning, @@ -427,8 +421,7 @@ private: void RemoveCacheStorage(u64 program_id); bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id, u64* selected_title_id, u8* selected_content_record_type); - InstallResult InstallNSP(const QString& filename); - InstallResult InstallNCA(const QString& filename); + ContentManager::InstallResult InstallNCA(const QString& filename); void MigrateConfigFiles(); void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {}, std::string_view gpu_vendor = {}); @@ -523,6 +516,8 @@ private: std::unique_ptr<EmuThread> emu_thread; // The path to the game currently running QString current_game_path; + // Whether a user was set on the command line (skips UserSelector if it's forced to show up) + bool user_flag_cmd_line = false; bool auto_paused = false; bool auto_muted = false; |