From 8cf025bf7105918b9e6f813fd04ab90b3e48b86d Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Wed, 21 Aug 2019 23:11:34 +0300 Subject: [PATCH] Use g_fxo for cellWebBrowser Rename browser_t -> browser_info --- rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp index e8e5f8013f..b1be0be813 100644 --- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp +++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp @@ -6,7 +6,7 @@ extern logs::channel cellSysutil; -struct browser_t +struct browser_info { vm::ptr system_cb; vm::ptr userData; @@ -215,7 +215,7 @@ error_code cellWebBrowserInitialize(vm::ptr system { cellSysutil.todo("cellWebBrowserInitialize(system_cb=*0x%x, container=0x%x)", system_cb, container); - const auto browser = fxm::make_always(); + const auto browser = g_fxo->get(); browser->system_cb = system_cb; sysutil_register_cb([=](ppu_thread& ppu) -> s32 @@ -246,10 +246,10 @@ void cellWebBrowserShutdown() { cellSysutil.todo("cellWebBrowserShutdown()"); + const auto browser = g_fxo->get(); + sysutil_register_cb([=](ppu_thread& ppu) -> s32 { - const auto browser = fxm::get_always(); - browser->system_cb(ppu, CELL_SYSUTIL_WEBBROWSER_SHUTDOWN_FINISHED, browser->userData); return CELL_OK; });