From ad33e49873495070250a290b2c2f9f8fbf7ab570 Mon Sep 17 00:00:00 2001 From: CLARATION Date: Tue, 30 Jun 2026 17:05:47 -0700 Subject: [PATCH] feat(gui): exit recovery when exiting dfu panel --- src/wx/AppFrame.cpp | 9 ++------- src/wx/DfuPanel.cpp | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wx/AppFrame.cpp b/src/wx/AppFrame.cpp index c723a10..f374cd7 100644 --- a/src/wx/AppFrame.cpp +++ b/src/wx/AppFrame.cpp @@ -12,11 +12,6 @@ #include #include -#ifdef _WIN32 -# include -# define sleep(x) Sleep(x*1000) -#endif - wxDEFINE_EVENT(EVT_DEVICE_STATE_UPDATE, wxCommandEvent); void send_device_state(MainFrame* frame, const DeviceState& state) @@ -71,7 +66,7 @@ MainFrame::MainFrame() idevice_event_subscribe(normal_device_event_cb, this); while (true) - sleep(1); + sleep_ms(1000); }).detach(); std::thread([this]() @@ -85,7 +80,7 @@ MainFrame::MainFrame() ); while (true) - sleep(1); + sleep_ms(1000); }).detach(); } diff --git a/src/wx/DfuPanel.cpp b/src/wx/DfuPanel.cpp index a72d98a..be31e76 100644 --- a/src/wx/DfuPanel.cpp +++ b/src/wx/DfuPanel.cpp @@ -60,8 +60,9 @@ DfuPanel::DfuPanel(MainFrame* frame, wxWindow* parent) m_backButton = new wxButton(this, wxID_ANY, "Back"); m_startButton = new wxButton(this, wxID_ANY, "Start"); - m_backButton->Bind(wxEVT_BUTTON, [frame](wxCommandEvent&) + m_backButton->Bind(wxEVT_BUTTON, [frame, this](wxCommandEvent&) { + Reboot(); frame->ShowMain(); });