From 33d8edeb9ad938f59378565896ee57b795d3bc34 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Tue, 28 Jan 2025 01:41:29 +0100 Subject: [PATCH] Get file format from name. (#5532) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lukas Brübach --- .../client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp | 2 +- .../deck_preview/deck_preview_tag_addition_widget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index 728473d8a..e54811db2 100644 --- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -25,7 +25,7 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor) void TabDeckStorageVisual::actOpenLocalDeck(QMouseEvent * /*event*/, DeckPreviewWidget *instance) { DeckLoader deckLoader; - if (!deckLoader.loadFromFile(instance->filePath, DeckLoader::CockatriceFormat, true)) { + if (!deckLoader.loadFromFile(instance->filePath, DeckLoader::getFormatFromName(instance->filePath), true)) { return; } diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index a188f23b6..4f4304e05 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -44,7 +44,7 @@ void DeckPreviewTagAdditionWidget::mousePressEvent(QMouseEvent *event) bool canAddTags = true; - if (parent->deckLoader->getLastFileFormat() != DeckLoader::CockatriceFormat) { + if (DeckLoader::getFormatFromName(parent->parent->filePath) != DeckLoader::CockatriceFormat) { canAddTags = false; // Retrieve saved preference if the prompt is disabled if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {