From 26b4ce849ae1961cd2ffb22adc9569e769b1f8ec Mon Sep 17 00:00:00 2001 From: YTKAB0BP Date: Sun, 17 Nov 2024 23:23:56 +0300 Subject: [PATCH] Null-check findPrint in filament selection --- .../slicebeam/fragment/FilamentConfigFragment.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java b/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java index 4e423c1..cc518d5 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java +++ b/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java @@ -39,13 +39,15 @@ public class FilamentConfigFragment extends ProfileListFragment { List nList = new ArrayList<>(list.size()); Slic3rUtils.ConfigChecker checker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrinter(printer).serialize()); - Slic3rUtils.ConfigChecker printChecker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrint(print).serialize()); - for (ConfigObject obj : list) { - if (checker.checkCompatibility(obj.get("compatible_printers_condition")) && printChecker.checkCompatibility(obj.get("compatible_prints_condition"))) { - nList.add(obj); + if (SliceBeam.CONFIG.findPrint(print) != null) { + Slic3rUtils.ConfigChecker printChecker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrint(print).serialize()); + for (ConfigObject obj : list) { + if (checker.checkCompatibility(obj.get("compatible_printers_condition")) && printChecker.checkCompatibility(obj.get("compatible_prints_condition"))) { + nList.add(obj); + } } + printChecker.release(); } - printChecker.release(); checker.release(); lastPrinter = printer; lastPrint = print;