external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX a bug which caused the deck catalog not to update after saving the deck when current game type was not constructed!

Browse Source 
This commit FIX #1961

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
This commit is contained in:
leriomaggio
2021-09-07 01:11:49 +01:00
parent 84763e5dbc
commit 43196e7c74
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
View File

@@ -1,5 +1,9 @@
package forge.screens.deckeditor; package forge.screens.deckeditor;
import forge.gui.framework.ICDoc;
import forge.gui.framework.IVDoc;
import forge.screens.deckeditor.controllers.*;
import forge.screens.deckeditor.views.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@@ -9,10 +13,6 @@ import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences; import forge.deck.io.DeckPreferences;
import forge.gui.framework.FScreen; import forge.gui.framework.FScreen;
import forge.model.FModel; import forge.model.FModel;
import forge.screens.deckeditor.controllers.CAllDecks;
import forge.screens.deckeditor.controllers.DeckController;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.util.Localizer; import forge.util.Localizer;
@@ -58,8 +58,28 @@ public class SEditorIO {
if (performSave) { if (performSave) {
controller.saveAs(name); controller.saveAs(name);
CAllDecks.SINGLETON_INSTANCE.refresh(); //pull new deck into deck list and select it switch (CDeckEditorUI.SINGLETON_INSTANCE.getCurrentEditorController().getGameType()){
VAllDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr); case Brawl:
CBrawlDecks.SINGLETON_INSTANCE.refresh();
VBrawlDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr);
break;
case Commander:
CCommanderDecks.SINGLETON_INSTANCE.refresh();
VCommanderDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr);
break;
case TinyLeaders:
CTinyLeadersDecks.SINGLETON_INSTANCE.refresh();
VTinyLeadersDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr);
break;
case Oathbreaker:
COathbreakerDecks.SINGLETON_INSTANCE.refresh();
VOathbreakerDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr);
break;
default:
CAllDecks.SINGLETON_INSTANCE.refresh(); //pull new deck into deck list and select it
VAllDecks.SINGLETON_INSTANCE.getLstDecks().setSelectedString(deckStr);
break;
}
// Set current quest deck to selected // Set current quest deck to selected
if (Singletons.getControl().getCurrentScreen() == FScreen.DECK_EDITOR_QUEST) { if (Singletons.getControl().getCurrentScreen() == FScreen.DECK_EDITOR_QUEST) {
FModel.getQuest().setCurrentDeck(name); FModel.getQuest().setCurrentDeck(name);