diff options
author | bunnei <bunneidev@gmail.com> | 2021-08-25 03:31:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-25 03:31:27 +0200 |
commit | 4654fb96b0e2eb1b57857ae7f0438341fb2f9292 (patch) | |
tree | 4b257caf10eb6e7dfd2113671a7ebdcd845dcf3b /src/core/core.cpp | |
parent | Merge pull request #6878 from BreadFish64/optimize-GetHostThreadID (diff) | |
parent | logging: Fix log filter during initialization (diff) | |
download | yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.gz yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.bz2 yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.lz yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.xz yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.zst yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.zip |
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index b0dc594d4..5893a86bf 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -4,6 +4,7 @@ #include <array> #include <atomic> +#include <exception> #include <memory> #include <utility> @@ -423,9 +424,16 @@ struct System::Impl { System::System() : impl{std::make_unique<Impl>(*this)} {} System::~System() = default; +System& System::GetInstance() { + if (!s_instance) { + throw std::runtime_error("Using System instance before its initialization"); + } + return *s_instance; +} + void System::InitializeGlobalInstance() { if (s_instance) { - abort(); + throw std::runtime_error("Reinitializing Global System instance."); } s_instance = std::unique_ptr<System>(new System); } |