tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Crash and Fade Stuff

Browse Source
This commit is contained in:
tobid7 2023-03-12 21:37:22 +01:00
parent 0399808eb2
commit f6e3c50814
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/renderd7.cpp
View File

@ -387,7 +387,7 @@ bool RenderD7::MainLoop() {
RenderD7::Scene::doDraw(); RenderD7::Scene::doDraw();
RenderD7::Scene::doLogic(d7_hDown, d7_hHeld, d7_hUp, d7_touch); RenderD7::Scene::doLogic(d7_hDown, d7_hHeld, d7_hUp, d7_touch);
cnttttt++; cnttttt++;
if (cnttttt > 90) { if (cnttttt > 2) {
shouldbe_disabled = false; shouldbe_disabled = false;
cnttttt = 0; cnttttt = 0;
} }
@ -769,6 +769,14 @@ void RenderD7::ExitApp() {
FadeExit = true; FadeExit = true;
} else } else
running = false; running = false;
} else {
// Normally Forbidden
fadein = false;
waitFade = false;
RenderD7::FadeIn();
RenderD7::AddOvl(std::make_unique<RenderD7::Toast>(
"RenderD7", "Exiting in Settings is Not Allowed!\nPress B to Get Out "
"and then Exit."));
} }
} }
@ -1001,14 +1009,15 @@ void RenderD7::FrameEnd() {
RenderD7::DrawMetrikOvl(); RenderD7::DrawMetrikOvl();
if (!shouldbe_disabled) { if (!shouldbe_disabled) {
OvlHandler(); OvlHandler();
Npifade();
} }
lp++; lp++;
Npifade();
C3D_FrameEnd(0); C3D_FrameEnd(0);
} }
RenderD7::RSettings::RSettings() { RenderD7::RSettings::RSettings() {
aptSetHomeAllowed(false);
RenderD7::FadeIn(); RenderD7::FadeIn();
cfgfile = std::make_unique<INI::INIFile>(cfgpath + "/config.ini"); cfgfile = std::make_unique<INI::INIFile>(cfgpath + "/config.ini");
cfgfile->read(cfgstruct); cfgfile->read(cfgstruct);
@ -1017,7 +1026,10 @@ RenderD7::RSettings::RSettings() {
calculate_screens(lines, screen_index, screens); calculate_screens(lines, screen_index, screens);
} }
RenderD7::RSettings::~RSettings() { cfgfile->write(cfgstruct); } RenderD7::RSettings::~RSettings() {
cfgfile->write(cfgstruct);
aptSetHomeAllowed(false);
}
std::vector<std::string> StrHelper(std::string input) { std::vector<std::string> StrHelper(std::string input) {
std::string ss(input); std::string ss(input);
@ -1167,6 +1179,9 @@ void RenderD7::RSettings::Logic(u32 hDown, u32 hHeld, u32 hUp,
mtscreenstate = mt_screen ? "Bottom" : "Top"; mtscreenstate = mt_screen ? "Bottom" : "Top";
if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[0]) && if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[0]) &&
!metrikd) { !metrikd) {
RenderD7::AddOvl(std::make_unique<RenderD7::Toast>(
"RenderD7",
"RenderD7-Super-Reselution Does not\nWork Correctly yet!"));
RenderD7::ToggleRD7SR(); RenderD7::ToggleRD7SR();
cfgstruct["settings"]["super-reselution"] = cfgstruct["settings"]["super-reselution"] =
rd7_superreselution ? "1" : "0"; rd7_superreselution ? "1" : "0";