diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java index f452e86dc8f..5420b512615 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java @@ -65,7 +65,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService { final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg"; final String setcode2 = StaticData.instance().getEditions().getCode2ByCode(c.getEdition()); String modifier = !imageKey.contains(".full") ? ".fullborder" : ""; - final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + "\\" + TextUtil.fastReplace(imageKey,".full",".fullborder") + modifier + ".jpg"; + final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + ForgeConstants.PATH_SEPARATOR + TextUtil.fastReplace(imageKey,".full",".fullborder") + modifier + ".jpg"; final File existingFB = new File (fullborderPath); final File existingFB2 = new File (TextUtil.fastReplace(fullborderPath, "1.fullborder", ".fullborder")); diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java index 345647f207e..0b7862ec05f 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java @@ -124,8 +124,9 @@ public final class ItemManagerModel { public void refreshSort() { if (getOrderedList().isEmpty()) { return; } - - Collections.sort(getOrderedList(), new MyComparator()); + //fix newdeck editor not loading on Android if a user deleted unwanted sets on edition folder + try { Collections.sort(getOrderedList(), new MyComparator()); } + catch (IllegalArgumentException ex) {} } //Manages sorting orders for multiple depths of sorting