diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index d899f709..fc922429 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -148,11 +148,6 @@ namespace lms::scanner }); } - void ScannerService::requestStop() - { - abortScan(); - } - void ScannerService::requestReload() { abortScan(); diff --git a/src/libs/services/scanner/impl/ScannerService.hpp b/src/libs/services/scanner/impl/ScannerService.hpp index ea52aa1a..5750c915 100644 --- a/src/libs/services/scanner/impl/ScannerService.hpp +++ b/src/libs/services/scanner/impl/ScannerService.hpp @@ -50,7 +50,6 @@ namespace lms::scanner ScannerService(const ScannerService&) = delete; ScannerService& operator=(const ScannerService&) = delete; - void requestStop() override; void requestReload() override; void requestImmediateScan(const ScanOptions& scanOptions) override; diff --git a/src/libs/services/scanner/include/services/scanner/IScannerService.hpp b/src/libs/services/scanner/include/services/scanner/IScannerService.hpp index c66d864c..2c724449 100644 --- a/src/libs/services/scanner/include/services/scanner/IScannerService.hpp +++ b/src/libs/services/scanner/include/services/scanner/IScannerService.hpp @@ -38,9 +38,7 @@ namespace lms::scanner virtual ~IScannerService() = default; // Async requests - virtual void requestStop() = 0; - virtual void requestReload() = 0; - + virtual void requestReload() = 0; // will stop/reschedule scan virtual void requestImmediateScan(const ScanOptions& options = {}) = 0; enum class State diff --git a/src/lms/ui/admin/MediaLibrariesView.cpp b/src/lms/ui/admin/MediaLibrariesView.cpp index 968602be..776c213d 100644 --- a/src/lms/ui/admin/MediaLibrariesView.cpp +++ b/src/lms/ui/admin/MediaLibrariesView.cpp @@ -106,7 +106,7 @@ namespace lms::ui } // Don't want the scanner to go on with wrong settings - core::Service::get()->requestStop(); + core::Service::get()->requestReload(); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted")); _libraries->removeWidget(libraryEntry); @@ -148,7 +148,7 @@ namespace lms::ui updateEntry(newMediaLibraryId, entry); // Don't want the scanner to go on with wrong settings - core::Service::get()->requestStop(); + core::Service::get()->requestReload(); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.settings-saved")); LmsApp->getModalManager().dispose(mediaLibraryModalPtr); diff --git a/src/lms/ui/admin/ScanSettingsView.cpp b/src/lms/ui/admin/ScanSettingsView.cpp index fa37f480..f1878101 100644 --- a/src/lms/ui/admin/ScanSettingsView.cpp +++ b/src/lms/ui/admin/ScanSettingsView.cpp @@ -269,7 +269,7 @@ namespace lms::ui core::Service::get()->load(); // Don't want the scanner to go on with wrong settings - core::Service::get()->requestStop(); + core::Service::get()->requestReload(); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.settings-saved")); }