Fixed more crashes relating to scrollbar in GUIs, fixes #1377

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.14
+- Fixed more crashes relating to scrollbar in GUIs (raoulvdberge)
+
 ### 1.5.13
 - Fixed Wireless Fluid Grid not using up energy (raoulvdberge)
 - Fixed Wireless Crafting Monitor remaining in network item list (raoulvdberge)

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java

@@ -35,9 +35,11 @@ public class GuiController extends GuiBase {
 
     @Override
     public void update(int x, int y) {
+        if (scrollbar != null) {
             scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
             scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
         }
+    }
 
     @Override
     public void drawBackground(int x, int y, int mouseX, int mouseY) {

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java

@@ -82,16 +82,23 @@ public class GuiCraftingMonitor extends GuiBase {
 
     @Override
     public void update(int x, int y) {
+        if (scrollbar != null) {
             scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
             scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
+        }
 
         if (itemSelected >= getElements().size()) {
             itemSelected = -1;
         }
 
+        if (cancelButton != null) {
             cancelButton.enabled = itemSelected != -1 && getElements().get(itemSelected).getTaskId() != -1;
+        }
+
+        if (cancelAllButton != null) {
             cancelAllButton.enabled = getElements().size() > 0;
         }
+    }
 
     @Override
     public void drawBackground(int x, int y, int mouseX, int mouseY) {

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java

@@ -78,10 +78,12 @@ public class GuiCraftingPreview extends GuiBase {
 
     @Override
     public void update(int x, int y) {
+        if (scrollbar != null) {
             scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
             scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
+        }
 
-        if (!startButton.enabled && isCtrlKeyDown() && isShiftKeyDown()) {
+        if (startButton != null && !startButton.enabled && isCtrlKeyDown() && isShiftKeyDown()) {
             startButton.enabled = true;
         }
     }

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java

@@ -60,8 +60,10 @@ public class GuiReaderWriter extends GuiBase {
 
     @Override
     public void update(int x, int y) {
+        if (scrollbar != null) {
             scrollbar.setEnabled(getRows() > VISIBLE_ROWS);
             scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS);
+        }
 
         if (itemSelected >= getChannels().size()) {
             itemSelected = -1;

src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java

@@ -218,9 +218,11 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
 
         STACKS = stacks;
 
+        if (scrollbar != null) {
             scrollbar.setEnabled(getRows() > getVisibleRows());
             scrollbar.setMaxOffset(getRows() - getVisibleRows());
         }
+    }
 
     @Override
     public void update(int x, int y) {