diff options
| author | James Rowe <jroweboy@gmail.com> | 2020-03-25 05:57:36 +0100 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2020-03-26 06:32:42 +0100 |
| commit | cf9c94d4017120b618194a720942ef4e5c8289bd (patch) | |
| tree | 30cbea0216626e3a1db1a68120b54e6bd53804f5 /src/core | |
| parent | Frontend/GPU: Refactor context management (diff) | |
| download | yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar.gz yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar.bz2 yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar.lz yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar.xz yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.tar.zst yuzu-cf9c94d4017120b618194a720942ef4e5c8289bd.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 4 | ||||
| -rw-r--r-- | src/core/frontend/emu_window.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 6cc4a0812..26a580cb7 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -169,6 +169,9 @@ struct System::Impl { interrupt_manager = std::make_unique<Core::Hardware::InterruptManager>(system); gpu_core = VideoCore::CreateGPU(emu_window, system); + if (!gpu_core) { + return ResultStatus::ErrorVideoCore; + } gpu_core->Renderer().Rasterizer().SetupDirtyFlags(); is_powered_on = true; @@ -181,7 +184,6 @@ struct System::Impl { ResultStatus Load(System& system, Frontend::EmuWindow& emu_window, const std::string& filepath) { - app_loader = Loader::GetLoader(GetGameFileFromPath(virtual_filesystem, filepath)); if (!app_loader) { LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index bb283d844..72294d4d8 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -30,7 +30,7 @@ public: class Scoped { public: - Scoped(GraphicsContext& context_) : context(context_) { + explicit Scoped(GraphicsContext& context_) : context(context_) { context.MakeCurrent(); } ~Scoped() { |