Now the lib tries to mount the SD Card on each start until it actually works

This should fix the config reading problems some people have.
Also fixing some compiler warnings
This commit is contained in:
Maschell 2017-04-06 12:50:27 +02:00
parent a5e30d27b3
commit 7d72d0e2ff
6 changed files with 10 additions and 10 deletions

@ -1 +1 @@
Subproject commit 7292edb8cee47f25210eb3ad1df6224938fc90d8
Subproject commit 5a3aa0d0aab1d1729f46f01c5b53f72a4a2dbd92

View File

@ -59,7 +59,7 @@ extern "C" int Menu_Main(void){
log_print("Initializing the controller data\n");
bool res = ControllerPatcher::Init();
if(!res){
SplashScreen(5, "Error. The app starts in 5 seconds without patches.");
SplashScreen(5, std::string("Error. The app starts in 5 seconds without patches.").c_str());
RestorePatches();
return EXIT_RELAUNCH_ON_LOAD;
}
@ -138,7 +138,7 @@ int isInMiiMakerHBL(){
}
void SplashScreen(int time,char * message){
void SplashScreen(int time,const char * message){
// Prepare screen
int screen_buf0_size = 0;

View File

@ -16,7 +16,7 @@ void ApplyPatches(void);
void RestorePatches(void);
int isInMiiMakerHBL();
void SplashScreen(int time,char * message);
void SplashScreen(int time,const char * message);
#ifdef __cplusplus
}
#endif

View File

@ -158,7 +158,7 @@ void MenuListDRC::addToTotalOffset(f32 added_offset){
void MenuListDRC::update(GuiController * c){
if(dpad_selection_changed && (lastSelectedItem != selectedItem)){
lastSelectedItem = selectedItem;
if(selectedItem >= 0 && selectedItem < listElementsButtons.size()){
if(selectedItem >= 0 && (u32) selectedItem < listElementsButtons.size()){
int i = 0;
MenuElement * element = NULL;
for (std::vector<MenuElement*>::iterator it = listElementsButtons.begin() ; it != listElementsButtons.end(); ++it){
@ -185,7 +185,7 @@ void MenuListDRC::update(GuiController * c){
addToTotalOffset(-1*(offset));
scroll_needs_update = true;
}else if(-1*(element->getOffsetY() - element->getHeight()) > this->getHeight()){
if(i+1 < listElementsButtons.size()){
if(i >=0 && (u32)i+1 < listElementsButtons.size()){
MenuElement * nextElement = listElementsButtons[i+1];
if(nextElement != NULL){
addToTotalOffset(-1*(nextElement->getOffsetY()) - this->getHeight());

View File

@ -29,8 +29,8 @@ ContentHelp::ContentHelp(): ContentTemplate(){
f32 positionY = 200.0f;
f32 positionX = 40.0f;
f32 positionX2 = 250.0f;
f32 positionX3 = 80.0f;
//f32 positionX2 = 250.0f;
//f32 positionX3 = 80.0f;
int fontSize = 35;
int fontSize2 = 24;

View File

@ -29,8 +29,8 @@ ContentNetworkHelp::ContentNetworkHelp(): ContentTemplate(){
f32 positionY = 200.0f;
f32 positionX = 40.0f;
f32 positionX2 = 250.0f;
f32 positionX3 = 80.0f;
//f32 positionX2 = 250.0f;
//f32 positionX3 = 80.0f;
int fontSize = 35;
int fontSize2 = 24;