Merge remote-tracking branch 'upstream/master' into decree+

This commit is contained in:
CocoTheOwner 2021-08-13 11:59:34 +02:00
commit 5f5e04506c

View File

@ -108,7 +108,8 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
@EventHandler @EventHandler
public void on(IrisEngineHotloadEvent e) { public void on(IrisEngineHotloadEvent e) {
generator = loader.get(); if (generator != null)
generator = loader.get();
} }
public void mouseWheelMoved(MouseWheelEvent e) { public void mouseWheelMoved(MouseWheelEvent e) {