I forget to add this in 1.0.0

D3fau4 · Nov 19, 2020 · cecff7f · cecff7f
1 parent ba5fab1
commit cecff7f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/NightFall/borealis/library/lib/application.cpp b/NightFall/borealis/library/lib/application.cpp
@@ -718,8 +718,11 @@ void Application::giveFocus(View* view)
 
 void Application::popView(ViewAnimation animation, std::function<void(void)> cb)
 {
-    if (Application::viewStack.size() <= 1) // never pop the root view
+    if (Application::viewStack.size() <= 1){
+        if (Application::quitOnPopRoot)
+            Application::quit();
         return;
+    }   
 
     Application::blockInputs();
 
@@ -790,7 +793,8 @@ void Application::pushView(View* view, ViewAnimation animation)
     bool fadeOut = last && !last->isTranslucent() && !view->isTranslucent(); // play the fade out animation?
     bool wait    = animation == ViewAnimation::FADE; // wait for the old view animation to be done before showing the new one?
 
-    view->registerAction("brls/hints/exit"_i18n, Key::PLUS, [] { Application::quit(); return true; });
+    if (Application::globalQuit)
+        view->registerAction("brls/hints/exit"_i18n, Key::PLUS, [] { Application::quit(); return true; });
     view->registerAction(
         "FPS", Key::MINUS, [] { Application::toggleFramerateDisplay(); return true; }, true);
 

diff --git a/NightFall/resources/i18n/en-US/main.json b/NightFall/resources/i18n/en-US/main.json
@@ -8,8 +8,8 @@
             "title": "Firmware",
             "update": {
                 "title": "System Update",
-                "title_offline": "System Update Offline",
-                "current_fw": "Current system version:",
+                "title_offline": "Start System Update Offline",
+                "current_fw": "Current system version",
                 "update_select": "Select Firmware:",
                 "update_required": "Update required",
                 "update_install": "Install Update",
@@ -26,9 +26,9 @@
                 "yes": "Yes",
                 "no": "No"
             },
-            "delete_options":{
-                "title":"",
-                "subtitle":"Do you want delete the folder after installing it?",
+            "delete_options": {
+                "title": "Delete Folder",
+                "subtitle": "Do you want delete the folder after installing it?",
                 "yes": "Yes",
                 "no": "No"
             },

diff --git a/NightFall/resources/i18n/es/main.json b/NightFall/resources/i18n/es/main.json
@@ -8,8 +8,8 @@
             "title": "Firmware",
             "update": {
                 "title": "Actualización de la consola",
-                "title_offline":"Actualización de la consola offline",
-                "current_fw": "Versión actual:",
+                "title_offline": "Empezar actualización de la consola offline",
+                "current_fw": "Versión actual",
                 "update_select": "Selecciona un firmware:",
                 "update_required": "Actualización pendiente",
                 "update_install": "Instalar actualización",
@@ -26,9 +26,9 @@
                 "yes": "Si",
                 "no": "No"
             },
-            "delete_options":{
-                "title":"Borrar la carpeta",
-                "subtitle":"¿Quieres borrar la carpeta después de instalar el firmware?",
+            "delete_options": {
+                "title": "Borrar datos instalados",
+                "subtitle": "¿Quieres borrar la carpeta después de instalar el firmware?",
                 "yes": "Si",
                 "no": "No"
             },

diff --git a/NightFall/source/thread.cpp b/NightFall/source/thread.cpp
@@ -25,6 +25,7 @@ SOFTWARE.*/
 #include <string>
 #include <iostream>
 #include "net/net.hpp"
+#include "FS/FS.hpp"
 
 /* Var */
 json V1;
@@ -216,6 +217,8 @@ namespace BackGround
                 }
                 if (m_UpdateState == UpdateState::AwaitingReboot)
                 {
+                    if (config["Exfat"].get<int>() == 1)
+                        FS::DeleteDir(this->m_path.c_str());
                     brls::Logger::debug("Preparado: Reinicio en 3s");
                     std::this_thread::sleep_for(3s);
                     bpcInitialize();