diff --git a/rare/components/main_window.py b/rare/components/main_window.py index a018fdfd..9ce559a9 100644 --- a/rare/components/main_window.py +++ b/rare/components/main_window.py @@ -241,7 +241,8 @@ class MainWindow(QMainWindow): self, self.tr("Quit {}?").format(QApplication.applicationName()), self.tr( - "There are active operations. The application cannot exit until they are completed.\n" + "There are currently running operations. " + "Rare cannot exit until they are completed.\n\n" "Do you want to clear the queue?" ), buttons=(QMessageBox.Yes | QMessageBox.No), @@ -251,7 +252,7 @@ class MainWindow(QMainWindow): self.rcore.queue_threadpool.clear() for qw in self.rcore.queued_workers(): self.rcore.queue_workers.remove(qw) - self.update_statusbar() + self.update_statusbar() e.ignore() return elif self.tab_widget.downloads_tab.is_download_active: @@ -259,7 +260,8 @@ class MainWindow(QMainWindow): self, self.tr("Quit {}?").format(QApplication.applicationName()), self.tr( - "There is an active download. Quitting will stop the download.\n" + "There is an active download. " + "Quitting Rare now will stop the download.\n\n" "Are you sure you want to quit?" ), buttons=(QMessageBox.Yes | QMessageBox.No), diff --git a/rare/shared/rare_core.py b/rare/shared/rare_core.py index e2eee268..73636332 100644 --- a/rare/shared/rare_core.py +++ b/rare/shared/rare_core.py @@ -63,10 +63,10 @@ class RareCore(QObject): self.__signals.application.update_statusbar.emit() def active_workers(self) -> Iterator[QueueWorker]: - return filter(lambda w: w.state == QueueWorkerState.ACTIVE, self.queue_workers) + return list(filter(lambda w: w.state == QueueWorkerState.ACTIVE, self.queue_workers)) def queued_workers(self) -> Iterator[QueueWorker]: - return filter(lambda w: w.state == QueueWorkerState.QUEUED, self.queue_workers) + return list(filter(lambda w: w.state == QueueWorkerState.QUEUED, self.queue_workers)) def queue_info(self) -> List[QueueWorkerInfo]: return [w.worker_info() for w in self.queue_workers]