dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-04-16 21:31:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

use a jthread

Browse Source
This commit is contained in:
goeiecool9999 2024-10-20 18:41:18 +02:00
parent 8fa37f738c
commit 9500000adb
2 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/input/InputAPIAddWindow.cpp
View File

@ -212,7 +212,7 @@ void InputAPIAddWindow::on_api_selected(wxCommandEvent& event)
void InputAPIAddWindow::on_controller_dropdown(wxCommandEvent& event)
{
if (m_search_running)
if (m_search_thread.joinable())
return;
int selection = m_input_api->GetSelection();
@ -238,38 +238,31 @@ void InputAPIAddWindow::on_controller_dropdown(wxCommandEvent& event)
// TODO selected_uuid
}
m_search_running = true;
wxWindowUpdateLocker lock(m_controller_list);
m_controller_list->Clear();
m_controller_list->Append(_("Searching for controllers..."), (wxClientData*)nullptr);
m_controller_list->SetSelection(wxNOT_FOUND);
m_search_thread_data = std::make_unique<AsyncThreadData>();
std::thread([this, provider, selected_uuid](std::shared_ptr<AsyncThreadData> data)
m_search_thread = std::jthread([this, provider, selected_uuid](std::stop_token stopToken)
{
auto available_controllers = provider->get_controllers();
if(!stopToken.stop_requested())
{
std::lock_guard lock{data->mutex};
if(!data->discardResult)
{
wxCommandEvent event(wxControllersRefreshed);
event.SetEventObject(m_controller_list);
event.SetClientObject(new wxCustomData(std::move(available_controllers)));
event.SetInt(provider->api());
event.SetString(selected_uuid);
wxPostEvent(this, event);
m_search_running = false;
}
wxCommandEvent event(wxControllersRefreshed);
event.SetEventObject(m_controller_list);
event.SetClientObject(new wxCustomData(std::move(available_controllers)));
event.SetInt(provider->api());
event.SetString(selected_uuid);
wxPostEvent(this, event);
}
}, m_search_thread_data).detach();
});
}
void InputAPIAddWindow::on_controller_selected(wxCommandEvent& event)
{
if (m_search_running)
if (m_search_thread.joinable())
{
return;
}
@ -289,6 +282,7 @@ void InputAPIAddWindow::on_controller_selected(wxCommandEvent& event)
void InputAPIAddWindow::on_controllers_refreshed(wxCommandEvent& event)
{
m_search_thread = {};
const auto type = event.GetInt();
wxASSERT(0 <= type && type < InputAPI::MAX);
@ -317,10 +311,10 @@ void InputAPIAddWindow::on_controllers_refreshed(wxCommandEvent& event)
void InputAPIAddWindow::discard_thread_result()
{
m_search_running = false;
if(m_search_thread_data)
if(m_search_thread.joinable())
{
std::lock_guard lock{m_search_thread_data->mutex};
m_search_thread_data->discardResult = true;
m_search_thread.request_stop();
m_search_thread.detach();
m_search_thread = {};
}
}

8
src/gui/input/InputAPIAddWindow.h
View File

@ -52,11 +52,5 @@ private:
std::shared_ptr<ControllerBase> m_controller;
std::vector<ControllerPtr> m_controllers;
std::atomic_bool m_search_running = false;
struct AsyncThreadData
{
std::atomic_bool discardResult = false;
std::mutex mutex;
};
std::shared_ptr<AsyncThreadData> m_search_thread_data;
std::jthread m_search_thread;
};