From 16b55b94ea7ec73981e7ad47b5ed780c7fbfbaf2 Mon Sep 17 00:00:00 2001
From: hizumiaoba <56146205+hizumiaoba@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:50:45 +0900
Subject: [PATCH] fix: fix #52 #53

---
 src/com/ranfa/lib/handler/CrashReportList.java | 3 +++
 src/com/ranfa/main/DelesteRandomSelector.java  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/com/ranfa/lib/handler/CrashReportList.java b/src/com/ranfa/lib/handler/CrashReportList.java
index 8804250..d30f6a8 100644
--- a/src/com/ranfa/lib/handler/CrashReportList.java
+++ b/src/com/ranfa/lib/handler/CrashReportList.java
@@ -2,6 +2,7 @@ package com.ranfa.lib.handler;
 
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,6 +46,8 @@ public class CrashReportList <E> extends ArrayList<E> {
 	
 	public void outCrashReport() {
 		try {
+			if(Files.notExists(Paths.get("Crash-Report")))
+				Files.createDirectory(Paths.get("Crash-Report"));
 			FileWriter writer = new FileWriter(Paths.get("Crash-Report/" + FORMAT.format(new Date()) + ".txt").toFile());
 			writer.write(generateCrashReport());
 			writer.close();
diff --git a/src/com/ranfa/main/DelesteRandomSelector.java b/src/com/ranfa/main/DelesteRandomSelector.java
index 4be80c0..8ac80c6 100644
--- 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;
 				}
-- 
2.11.0