From f702a945732c68a91affd6c27cdf846de94bf2cc Mon Sep 17 00:00:00 2001
From: VoltZ <47382115+SuperSaiyajinVoltZ@users.noreply.github.com>
Date: Wed, 6 Nov 2019 17:03:59 +0100
Subject: [PATCH] This should fix the Issues.

Also: Don't do anything when pressed `A` on folders.
---
 source/screens/scriptBrowse.cpp | 10 +++++++++-
 source/screens/scriptlist.cpp   |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/screens/scriptBrowse.cpp b/source/screens/scriptBrowse.cpp
index 17f49ad..2a50476 100644
--- a/source/screens/scriptBrowse.cpp
+++ b/source/screens/scriptBrowse.cpp
@@ -132,8 +132,16 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 	if (hDown & KEY_A) {
 		if (jsonFileBrowse.size() != 0) {
 			std::string fileName = Lang::get("DOWNLOADING") + std::string(jsonFileBrowse[selection]["title"]);
+
+		std::string titleFix = jsonFileBrowse[selection]["title"]; 
+		for (int i = 0; i < (int)titleFix.size(); i++) {
+   			if (titleFix[i] == '/') {
+        		titleFix[i] = '-';
+    		}
+		}
 			DisplayMsg(fileName);
-			downloadToFile(jsonFileBrowse[selection]["url"], Config::ScriptPath + std::string(jsonFileBrowse[selection]["title"])+ ".json");
+
+			downloadToFile(jsonFileBrowse[selection]["url"], Config::ScriptPath + titleFix + ".json");
 		}
 	}
 
diff --git a/source/screens/scriptlist.cpp b/source/screens/scriptlist.cpp
index 497cffe..a46750c 100644
--- a/source/screens/scriptlist.cpp
+++ b/source/screens/scriptlist.cpp
@@ -278,7 +278,7 @@ void loadColors(nlohmann::json &json) {
 ScriptList::ScriptList() {
 	dirContents.clear();
 	chdir(Config::ScriptPath.c_str());
-	getDirectoryContents(dirContents);
+	getDirectoryContents(dirContents, {"json"});
 	for(uint i=0;i<dirContents.size();i++) {
 		fileInfo.push_back(parseInfo(dirContents[i].name));
 	}
@@ -375,7 +375,8 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld) {
 	}
 
 	if (hDown & KEY_A) {
-		if (fileInfo.size() != 0) {
+		if (dirContents[selection].isDirectory) {
+		} else if (fileInfo.size() != 0) {
 			currentFile = dirContents[selection].name;
 			selectedTitle = fileInfo[selection].title;
 			jsonFile = openScriptFile();