The-Homebrew-Cloud/homebrewfilter
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/homebrewfilter.git synced 2024-12-25 00:51:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixup previous command

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2012-11-28 19:23:35 +01:00
parent 8445199eba
commit 74f1df1e4d
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
installer/wad/0001000154484246.tmd
View File

Binary file not shown.

27
main/source/Prompts/prompt_end.cpp
View File

@ -5,6 +5,7 @@
#include "main.h"
#include "menu.h"
#include "Tools/SelectIos.h"
#include "xprintf.h"
extern bool runaway;
extern bool restarthbf;
@ -54,16 +55,18 @@ endPrompt()
GuiImage systemmenuImgOver(&btn_over);
GuiImage shutdownImgOver(&btn_over);
GuiText bootmiiTxt(tr("Launch BootMii (IOS)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
if(get_bootmii() == 3)
GuiText bootmiiTxt(tr("Launch BootMii (Boot2)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
GuiButton bootmii(btn.GetWidth(), btn.GetHeight());
bootmii.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
bootmii.SetPosition(0, 75);
bootmii.SetLabel(&bootmiiTxt);
bootmii.SetImage(&bootmiiImg);
bootmii.SetImageOver(&bootmiiImgOver);
bootmii.SetTrigger(&trigA);
GuiText bootmiiTxtBoot2(tr("Launch BootMii (Boot2)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
GuiText bootmiiTxtIOS(tr("Launch BootMii (IOS)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
GuiButton bootmii(btn.GetWidth(), btn.GetHeight());
if(get_bootmii() == 3)
bootmii.SetLabel(&bootmiiTxtBoot2);
else
bootmii.SetLabel(&bootmiiTxtIOS);
bootmii.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
bootmii.SetPosition(0, 75);
bootmii.SetImage(&bootmiiImg);
bootmii.SetImageOver(&bootmiiImgOver);
bootmii.SetTrigger(&trigA);
GuiText hbfTxt(tr("Restart HBF"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
GuiButton hbf(btn.GetWidth(), btn.GetHeight());
@ -124,10 +127,6 @@ endPrompt()
if(bootmii.GetState() == STATE_CLICKED)
{
if(get_bootmii() == 3)
set_bootmii(4);
else
set_bootmii(2);
menu = MENU_EXIT;
stop = true;
}

16
main/source/main.cpp
View File

@ -149,7 +149,6 @@ DefaultSettings()
Settings.last_app_pos = -1;
Settings.checkrev = -1;
sprintf (Settings.code, "NULL");
Settings.Apps_from = EFFECT_SLIDE_TOP; // Apps kommen von "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT"
Settings.Apps_to = 0; // Apps geht nach "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT"
Settings.grid = false;
@ -277,9 +276,14 @@ main(int argc, char *argv[])
BootHomebrew();
}
if(get_bootmii() == 2)
if(get_bootmii() != 0)
{
if(!check_uneek_fs())
if(Options.bootmii_boot2)
{
xprintf("Load BootMii (Boot2)\n");
SYS_ResetSystem(SYS_RESTART, 0, 0);
}
else if(!check_uneek_fs())
{
xprintf("Load BootMii (IOS)\n");
IOS_ReloadIOS(254);
@ -293,12 +297,6 @@ main(int argc, char *argv[])
}
}
if(get_bootmii() == 4)
{
xprintf("Load BootMii (Boot2)\n");
SYS_ResetSystem(SYS_RESTART, 0, 0);
}
if(get_nandemu() == 2)
{
if (opendir(check_path("sd1:/apps/NANDEmu-Boot").c_str()) != NULL)