diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp index 27a45253a..3bd85fc3c 100644 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp @@ -280,10 +280,6 @@ void SpoilerBackgroundUpdater::finish(const QString &error, bool updated) notificationIcon->showMessage(tr("Spoilers have been updated!"), tr("The card database now includes the downloaded spoilers.")); } - if (!guard) { - return; - } - emit spoilersUpdatedSuccessfully(); } else if (seasonEnded && !cancelled && notificationIcon) { notificationIcon->showMessage(tr("Spoiler season has ended"), tr("The spoiler database was removed. Please run Oracle to get released cards.")); diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h index beb72cbb8..a5a8b7667 100644 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h +++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h @@ -61,7 +61,6 @@ private: void reloadDatabase(bool updated); signals: - void spoilersUpdatedSuccessfully(); void spoilerCheckerDone(); void spoilerUpdateFailed(const QString &message); }; diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp index fb6855fa1..678c1fcae 100644 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp @@ -409,8 +409,10 @@ void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput) lastUpdatedLabel.setEnabled(anInput); infoOnSpoilersLabel.setEnabled(anInput); - if (!anInput && (sender() == &mcDownloadSpoilersCheckBox || - QFileInfo::exists(SettingsCache::instance().paths().getSpoilerCardDatabasePath()))) { + // Only react to the user disabling the setting. The constructor calls this to + // initialize the controls, and a leftover spoiler file is recovered through the + // Reload Card Database button rather than an unrequested reload on page open. + if (!anInput && sender() == &mcDownloadSpoilersCheckBox) { observeSpoilerUpdater(SpoilerBackgroundUpdater::deleteSpoilerFile()); } unlockSettings();