merged origin/dev

awidesky · Jul 23, 2021 · 7c0ad4f · 7c0ad4f
2 parents 0c4aa4d + 43f8e26
commit 7c0ad4f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/com/awidesky/YoutubeClipboardAutoDownloader/Main.java b/src/com/awidesky/YoutubeClipboardAutoDownloader/Main.java
@@ -393,7 +393,13 @@ public static void kill(int exitcode) {
 
 		if (executorService != null && !executorService.isShutdown()) executorService.shutdownNow();
 
-		Main.writeProperties();
+		try {
+			Main.writeProperties();
+		} catch (Exception e) {
+			log(e);
+		}
+
+
 
 		LoggerThread.isStop = true;
 

diff --git a/src/com/awidesky/YoutubeClipboardAutoDownloader/YoutubeAudioDownloader.java b/src/com/awidesky/YoutubeClipboardAutoDownloader/YoutubeAudioDownloader.java
@@ -83,9 +83,15 @@ public static boolean checkYoutubedl() {
 
 			if (!checkYoutubedlPath(youtubedlpath + "youtube-dl")) {
 
+<<<<<<< HEAD
 				GUI.error("Error!", "youtube-dl does not exist in\n\t" + youtubedlpath + "\nor system %path%!", null);
 	 			if (GUI.confirm("Open link in browser?", "Move to download page of youtube-dl?")) Main.webBrowse("http://ytdl-org.github.io/youtube-dl/download.html");
 				return false;
+=======
+				GUI.error("Error!", "youtube-dl does not exist in\n\t" + youtubedlpath + "\tor system %path%!", null);
+	 			if (GUI.confirm("youtube-dl does not exist!", "Move to download page of youtube-dl?")) Main.webBrowse("http://ytdl-org.github.io/youtube-dl/download.html");
+				Main.kill(1);
+>>>>>>> 43f8e26edf60e24d08e06e9286e62e195063b3eb
 
 			}
 
@@ -127,9 +133,15 @@ public static boolean checkFfmpeg() {
 
 		} catch (Exception e) {
 
+<<<<<<< HEAD
 			GUI.error("Error!", "ffmpeg does not exist in\n\t" + youtubedlpath + "\nor system %path%!", null);
 	 		if (GUI.confirm("Open link in browser?", "Move to download page of ffmpeg?")) Main.webBrowse("https://ffmpeg.org/download.html");
 			return false;
+=======
+			GUI.error("Error!", "ffmpeg does not exist in\n\t" + youtubedlpath + "\tor system %path%!", null);
+	 		if (GUI.confirm("ffmpeg does not exist!", "Move to download page of ffmpeg?")) Main.webBrowse("https://ffmpeg.org/download.html");
+			Main.kill(1);
+>>>>>>> 43f8e26edf60e24d08e06e9286e62e195063b3eb
 
 		}