diff options
author | bunnei <bunneidev@gmail.com> | 2021-08-23 05:40:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-23 05:40:18 +0200 |
commit | f65f8b909773ba79f54423c7d5d5eb1653cb7733 (patch) | |
tree | 3e851ea4e3bf6a353dba89029ab087709d33e366 /src/core/core.h | |
parent | Merge pull request #6904 from Morph1984/lang-settings-range (diff) | |
parent | logging: Simplify and make thread-safe (diff) | |
download | yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar.gz yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar.bz2 yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar.lz yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar.xz yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.tar.zst yuzu-f65f8b909773ba79f54423c7d5d5eb1653cb7733.zip |
Diffstat (limited to 'src/core/core.h')
-rw-r--r-- | src/core/core.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h index cd9af0c07..65b447a1c 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -121,9 +121,14 @@ public: * @returns Reference to the instance of the System singleton class. */ [[deprecated("Use of the global system instance is deprecated")]] static System& GetInstance() { - return s_instance; + if (!s_instance) { + abort(); + } + return *s_instance; } + static void InitializeGlobalInstance(); + /// Enumeration representing the return values of the System Initialize and Load process. enum class ResultStatus : u32 { Success, ///< Succeeded @@ -393,7 +398,7 @@ private: struct Impl; std::unique_ptr<Impl> impl; - static System s_instance; + inline static std::unique_ptr<System> s_instance{}; }; } // namespace Core |