DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Check for an Int for real on the Script version.

Browse Source
This commit is contained in:
VoltZ
2019-11-06 15:14:11 +01:00
parent eb8788d78d
commit d8531aa1fd
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/utils/common.hpp
+2 -1
View File
@@ -59,4 +59,5 @@ using json = nlohmann::json;
extern char * arg0;
#define WORKING_DIR "/"
#define SCRIPTS_PATH "sdmc:/3ds/Universal-Updater/scripts/" // The Scripts will be here.
#define SCRIPTS_PATH "sdmc:/3ds/Universal-Updater/scripts/" // The Scripts will be here.
#define SCRIPT_VERSION 2
source/screens/scriptlist.cpp
+11 -1
View File
@@ -62,6 +62,15 @@ std::string get(nlohmann::json json, const std::string &key, const std::string &
return json.at(key).at(key2).get_ref<const std::string&>();
}
int getNum(nlohmann::json json, const std::string &key, const std::string &key2) {
if(!json.contains(key)) return 0;
if(!json.at(key).is_object()) return 0;
if(!json.at(key).contains(key2)) return 0;
if(!json.at(key).at(key2).is_number()) return 0;
return json.at(key).at(key2).get_ref<const int64_t&>();
}
Info parseInfo(std::string fileName) {
FILE* file = fopen(fileName.c_str(), "rt");
if(!file) {
@@ -85,7 +94,8 @@ void checkForValidate(void) {
std::string version;
version = get(json, "info", "version");
if (version != "1") {
int ver = getNum(json, "info", "version");
if (ver < SCRIPT_VERSION || ver > SCRIPT_VERSION) {
Gui::DisplayWarnMsg(Lang::get("INCOMPATIBLE_SCRIPT"));
}
}