From 241813a5af11093c6b86e70ada729788c1f0dee6 Mon Sep 17 00:00:00 2001 From: yum Date: Tue, 27 Jun 2023 15:35:30 -0700 Subject: Adjust commit logic to use fuzzy string match threshold ... instead of simple equality. TODO: add UI for threshold. Bugfix: Frame::onAppStop() joins the OBS app thread. --- GUI/GUI/GUI/Frame.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'GUI') diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp index f4e99b9..8d4c868 100644 --- a/GUI/GUI/GUI/Frame.cpp +++ b/GUI/GUI/GUI/Frame.cpp @@ -2122,16 +2122,24 @@ void Frame::OnAppStart(wxCommandEvent& event) { } void Frame::OnAppStop() { + run_py_app_ = false; auto status = py_app_.wait_for(std::chrono::seconds(0)); if (status == std::future_status::ready) { Log(transcribe_out_, "Transcription engine already stopped\n"); - return; } - run_py_app_ = false; - py_app_.wait(); - obs_app_.wait(); + else { + py_app_.wait(); + Log(transcribe_out_, "Stopped transcription engine\n"); + } + status = obs_app_.wait_for(std::chrono::seconds(0)); + if (status == std::future_status::ready) { + Log(transcribe_out_, "Browser source already stopped\n"); + } + else { + obs_app_.wait(); + Log(transcribe_out_, "Stopped browser source\n"); + } transcript_.Clear(); - Log(transcribe_out_, "Stopped transcription engine\n"); } void Frame::OnAppStop(wxCommandEvent& event) { -- cgit v1.2.3