isTreatAllTabsAsOneBatch returns false in jrd mode and is not shown

judovana · Jul 11, 2023 · ba4f374 · ba4f374
1 parent d712ecd
commit ba4f374
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/...decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java b/...decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java
@@ -574,18 +574,20 @@ public void actionPerformed(ActionEvent actionEvent) {
             }
         });
         advanced.add(setMethod);
-        JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch");
-        Container parent = getParentWindow();
-        if (parent != null) {
-            treatAllAsOne.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent actionEvent) {
-                    setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected());
-                    repaintMenu(menu);
-                }
-            });
-            treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch());
-            advanced.add(treatAllAsOne);
+        if (getParentWindow() != null) {
+            JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch");
+            Container parent = getParentWindow();
+            if (parent != null) {
+                treatAllAsOne.addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent actionEvent) {
+                        setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected());
+                        repaintMenu(menu);
+                    }
+                });
+                treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch());
+                advanced.add(treatAllAsOne);
+            }
         }
         if (hasVm(classesAndMethodsProvider)) {
             JCheckBox addToBoot = new JCheckBox(
@@ -908,10 +910,16 @@ public boolean isBoot() {
     }
 
     private void setTreatAllTabsAsOneBatch(boolean selected) {
+        if (getParentWindow() == null) {
+            return;
+        }
         getParentWindow().setTreatAllTabsAsOneBatch(selected);
     }
 
     private boolean isTreatAllTabsAsOneBatch() {
+        if (getParentWindow() == null) {
+            return false;
+        }
         return getParentWindow().isTreatAllTabsAsOneBatch();
     }