summaryrefslogtreecommitdiffstats
path: root/src/core/core.h
diff options
context:
space:
mode:
authoryzct12345 <87620833+yzct12345@users.noreply.github.com>2021-08-13 20:39:45 +0200
committerGitHub <noreply@github.com>2021-08-13 20:39:45 +0200
commit001675dced1b7b751d1db4f0d6490776c613df2f (patch)
tree151923c90c42bdcede2581ddf6b56768bfcafc01 /src/core/core.h
parentMerge pull request #6862 from german77/badsdl (diff)
downloadyuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar.gz
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar.bz2
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar.lz
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar.xz
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.tar.zst
yuzu-001675dced1b7b751d1db4f0d6490776c613df2f.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h
index ea143043c..85836f2f8 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
@@ -396,7 +401,7 @@ private:
struct Impl;
std::unique_ptr<Impl> impl;
- static System s_instance;
+ inline static std::unique_ptr<System> s_instance{};
};
} // namespace Core