From c6a7f7c59ffbc432ba21b05a975fc718a8845048 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 1 Jun 2019 22:21:37 -0400 Subject: [PATCH] OD manager events will be signalled through the Project... ... not the project window, when those are distinct objects. This will keep the existing calls that bind the events correct. --- src/ondemand/ODManager.cpp | 3 +-- src/ondemand/ODTask.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp index 9f528eaf4..b6ae83e6a 100644 --- a/src/ondemand/ODManager.cpp +++ b/src/ondemand/ODManager.cpp @@ -424,8 +424,7 @@ void ODManager::Start() ODLocker locker{ &AllProjects::Mutex() }; AudacityProject* proj = GetActiveProject(); if(proj) - GetProjectFrame( *proj ) - .GetEventHandler()->AddPendingEvent(event); + proj->wxEvtHandler::AddPendingEvent(event); } mTerminateMutex.Lock(); } diff --git a/src/ondemand/ODTask.cpp b/src/ondemand/ODTask.cpp index 8400a95bf..418e03643 100644 --- a/src/ondemand/ODTask.cpp +++ b/src/ondemand/ODTask.cpp @@ -159,8 +159,7 @@ void ODTask::DoSome(float amountWork) if(IsTaskAssociatedWithProject(pProject.get())) { //this assumes tasks are only associated with one project. - GetProjectFrame( *pProject ) - .GetEventHandler()->AddPendingEvent(event); + pProject->wxEvtHandler::AddPendingEvent(event); //mark the changes so that the project can be resaved. UndoManager::Get( *pProject ).SetODChangesFlag(); break;