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

Crash fix attempt - Successfully! (#32)

Browse Source 
* Do not build here, since this could potential crash more things.

* Crash fix!

Co-authored-by: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com>
This commit is contained in:
Stackie
2020-05-29 07:28:08 +02:00
committed by GitHub
parent 8a16751a8f
commit a0251da39f
5 changed files with 24666 additions and 22692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
azure-pipelines.yml
+1 -1
View File
@@ -1,7 +1,7 @@
trigger: trigger:
branches: branches:
include: ['*'] include: ['*']
exclude: [translation, cleanup, full-rewrite] exclude: [translation, cleanup, crash-fix-attempt]
tags: tags:
include: ['*'] include: ['*']
include/utils/json.hpp
+2753 -780
View File
File diff suppressed because it is too large Load Diff
source/screens/scriptBrowse.cpp
+2 -1
View File
@@ -380,8 +380,8 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
DropDownLogic(hDown, hHeld, touch); DropDownLogic(hDown, hHeld, touch);
} else { } else {
if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) { if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
infoJson.clear();
Gui::screenBack(Config::fading); Gui::screenBack(Config::fading);
return;
} }
if (mode == 0) { if (mode == 0) {
if ((hHeld & KEY_DOWN && !keyRepeatDelay) || (hDown & KEY_TOUCH && touching(touch, arrowPos[1]))) { if ((hHeld & KEY_DOWN && !keyRepeatDelay) || (hDown & KEY_TOUCH && touching(touch, arrowPos[1]))) {
@@ -522,6 +522,7 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
} else { } else {
if (hDown & KEY_B) { if (hDown & KEY_B) {
Gui::screenBack(Config::fading); Gui::screenBack(Config::fading);
return;
} }
} }
} }
source/screens/settings.cpp
+4 -4
View File
@@ -266,7 +266,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY")); Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
changesMade = true; changesMade = true;
} else if (Selection == 3) { } else if (Selection == 3) {
/*if (Config::fading) { if (Config::fading) {
if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) { if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
Config::fading = false; Config::fading = false;
Msg::DisplayWarnMsg(Lang::get("DISABLED")); Msg::DisplayWarnMsg(Lang::get("DISABLED"));
@@ -278,7 +278,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
Msg::DisplayWarnMsg(Lang::get("ENABLED")); Msg::DisplayWarnMsg(Lang::get("ENABLED"));
changesMade = true; changesMade = true;
} }
}*/ }
} }
} }
@@ -296,7 +296,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
} else if (touching(touch, mainButtons2[2])) { } else if (touching(touch, mainButtons2[2])) {
Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY")); Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
changesMade = true; changesMade = true;
} /*else if (touching(touch, mainButtons2[3])) { } else if (touching(touch, mainButtons2[3])) {
if (Config::fading) { if (Config::fading) {
if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) { if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
Config::fading = false; Config::fading = false;
@@ -310,7 +310,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
changesMade = true; changesMade = true;
} }
} }
}*/ }
} }
if ((hDown & KEY_B || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) { if ((hDown & KEY_B || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
source/utils/config.cpp
+2 -2
View File
@@ -208,11 +208,11 @@ void Config::load() {
keyDelay = getInt("KEY_DELAY"); keyDelay = getInt("KEY_DELAY");
} }
/* if(!configJson.contains("SCREEN_FADE")) { if(!configJson.contains("SCREEN_FADE")) {
fading = false; fading = false;
} else { } else {
fading = getBool("SCREEN_FADE"); fading = getBool("SCREEN_FADE");
}*/ }
fclose(file); fclose(file);
} else { } else {