fix: fix #52 #53

[delesterandomselector/DelesteRandomSelector.git] / src / com / ranfa / main / DelesteRandomSelector.java

diff --git a/src/com/ranfa/main/DelesteRandomSelector.java b/src/com/ranfa/main/DelesteRandomSelector.java
index 4be80c0..8ac80c6 100644 (file)
--- a/src/com/ranfa/main/DelesteRandomSelector.java
+++ b/src/com/ranfa/main/DelesteRandomSelector.java
@@ -632,6 +632,10 @@ public class DelesteRandomSelector extends JFrame {
                        String currentTabName = tabbedPane.getTitleAt(tabbedPane.getSelectedIndex());
                        if(currentTabName.equals("SongInfo") && labelCurrentSongOrderTool.getText().equals("null")) {
                                logger.info("Detected switching tool tab");
+                               if(listToolMapDataFuture == null) {
+                                       logger.warn("Async task has not initialized yet. Aborting...");
+                                       return;
+                               }
                                if(toolIntegrateList == null) {
                                        return;
                                }