From 23bb85c6bf1750669fe7ac4d94dece42eace8b52 Mon Sep 17 00:00:00 2001 From: salix5 Date: Sun, 31 Aug 2025 20:21:22 +0800 Subject: [PATCH] Refactor LoadCurrentDeck --- gframe/deck_manager.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gframe/deck_manager.cpp b/gframe/deck_manager.cpp index f2f7549a5..152a0982a 100644 --- a/gframe/deck_manager.cpp +++ b/gframe/deck_manager.cpp @@ -320,11 +320,16 @@ bool DeckManager::LoadCurrentDeck(const wchar_t* file, bool is_packlist) { bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname) { wchar_t filepath[256]; GetDeckFile(filepath, category_index, category_name, deckname); + if (!filepath[0]) { + current_deck.clear(); + return false; + } bool is_packlist = (category_index == 0); - bool res = LoadCurrentDeck(filepath, is_packlist); - if (res && mainGame->is_building) + if(!LoadCurrentDeck(filepath, is_packlist)) + return false; + if (mainGame->is_building) mainGame->deckBuilder.RefreshPackListScroll(); - return res; + return true; } void DeckManager::SaveDeck(const Deck& deck, std::stringstream& deckStream) { deckStream << "#created by ..." << std::endl;