dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-01 12:15:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor wiimote_handler: Replace raw pointer with unique_ptr for instance management

Browse Source
This commit is contained in:
Barış Hamil 2026-02-28 19:44:12 +03:00
parent ff0e27d10a
commit 0bb398387b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpcs3/Input/wiimote_handler.cpp
View File

@ -205,13 +205,10 @@ bool wiimote_device::update()
return true; return true;
} }
static wiimote_handler* s_instance = nullptr; static std::unique_ptr<wiimote_handler> s_instance;
wiimote_handler::wiimote_handler() wiimote_handler::wiimote_handler()
{ {
if (!s_instance)
s_instance = this;
// Pre-initialize Wiimote slots (standard for DolphinBar and typical local multiplayer) // Pre-initialize Wiimote slots (standard for DolphinBar and typical local multiplayer)
for (usz i = 0; i < MAX_WIIMOTES; i++) for (usz i = 0; i < MAX_WIIMOTES; i++)
{ {
@ -224,8 +221,6 @@ wiimote_handler::wiimote_handler()
wiimote_handler::~wiimote_handler() wiimote_handler::~wiimote_handler()
{ {
stop(); stop();
if (s_instance == this)
s_instance = nullptr;
} }
wiimote_handler* wiimote_handler::get_instance() wiimote_handler* wiimote_handler::get_instance()
@ -235,10 +230,10 @@ wiimote_handler* wiimote_handler::get_instance()
if (!s_instance) if (!s_instance)
{ {
s_instance = new wiimote_handler(); s_instance = std::make_unique<wiimote_handler>();
s_instance->start(); s_instance->start();
} }
return s_instance; return s_instance.get();
} }
void wiimote_handler::start() void wiimote_handler::start()