diff --git a/src/Charts/CalendarWindow.cpp b/src/Charts/CalendarWindow.cpp index cd07a6437..446983521 100644 --- a/src/Charts/CalendarWindow.cpp +++ b/src/Charts/CalendarWindow.cpp @@ -62,6 +62,7 @@ CalendarWindow::CalendarWindow(Context *context) }); connect(context, &Context::filterChanged, this, &CalendarWindow::updateActivities); connect(context, &Context::homeFilterChanged, this, &CalendarWindow::updateActivities); + connect(context, &Context::autoImportCompleted, this, &CalendarWindow::updateActivities); connect(context, &Context::rideAdded, this, &CalendarWindow::updateActivitiesIfInRange); connect(context, &Context::rideDeleted, this, &CalendarWindow::updateActivitiesIfInRange); connect(context, &Context::rideChanged, this, &CalendarWindow::updateActivitiesIfInRange); diff --git a/src/Core/Context.h b/src/Core/Context.h index 9e4e0b631..b67cd4bf9 100644 --- a/src/Core/Context.h +++ b/src/Core/Context.h @@ -181,6 +181,8 @@ class Context : public QObject void notifyAthleteClose(QString folder, Context *context) { emit athleteClose(folder,context); } void notifyLoadDone(QString folder, Context *context) { emit loadDone(folder, context); } // MainWindow finished + void notifyAutoImportCompleted() { emit autoImportCompleted(); } + // preset charts void notifyPresetsChanged() { emit presetsChanged(); } void notifyPresetSelected(int n) { emit presetSelected(n); } @@ -285,6 +287,8 @@ class Context : public QObject void loadDone(QString, Context*); void athleteClose(QString, Context*); + void autoImportCompleted(); + // global filter changed void filterChanged(); void homeFilterChanged(); diff --git a/src/Gui/RideImportWizard.cpp b/src/Gui/RideImportWizard.cpp index 1885271fd..95a0d9b6d 100644 --- a/src/Gui/RideImportWizard.cpp +++ b/src/Gui/RideImportWizard.cpp @@ -1160,11 +1160,16 @@ RideImportWizard::abortClicked() phaseLabel->setText(donemessage); abortButton->setText(tr("Finish")); aborted = false; + + // notify everyone that the auto import process is complete + context->notifyAutoImportCompleted(); + if (autoImportStealth) { abortClicked(); // simulate pressing the "Finish" button - even if the window got visible } else { if (!isActiveWindow()) activateWindow(); } + }