From 1ec529df937503907396c8a6f52452cb394be9b2 Mon Sep 17 00:00:00 2001
From: Marco <marco.calautti@gmail.com>
Date: Wed, 7 Dec 2016 17:50:21 +0000
Subject: [PATCH 1/2] Added fallback elf launch

---
 dsrom/option_select/main.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dsrom/option_select/main.c b/dsrom/option_select/main.c
index 2cd0109..2b1787b 100644
--- a/dsrom/option_select/main.c
+++ b/dsrom/option_select/main.c
@@ -178,6 +178,18 @@ uint32_t __main(void)
 	char FnameChar[256];
 	memset(FnameChar,0,256);
 	int i;
+    
+    //There is a subtle case when there is a valid <button>= entry but the path on the right side is wrong and unrecoverable.
+    //For example, a=wiiu//apps/..., in this case Haxchi will recognize at least a valid button mapping, and will always try to
+    //run the associated path when pushing the button, but will fail. In this case, the fallback to HBL will never have a chance to work.
+    //Checking a a recovery button combination first.
+    if(vpad_data.btns_h & (BUTTON_L | BUTTON_R | BUTTON_DOWN | BUTTON_A))
+    {
+        strcpy((void*)0xF5E70000,"/vol/external01/recovery.elf");
+        goto fileEnd;
+    }
+        
+    
 	for(i = 0; i < 17; i++)
 	{
 		if((vpad_data.btns_h & sel[i].val) || (sel[i].val == 0))

From c53c0c2f23136753d6bd3e5dff40cbebef15f981 Mon Sep 17 00:00:00 2001
From: Marco <marco.calautti@gmail.com>
Date: Wed, 7 Dec 2016 21:55:47 +0000
Subject: [PATCH 2/2] Fixed vpad read for recovery mode

---
 dsrom/option_select/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dsrom/option_select/main.c b/dsrom/option_select/main.c
index 2b1787b..7245a27 100644
--- a/dsrom/option_select/main.c
+++ b/dsrom/option_select/main.c
@@ -183,7 +183,7 @@ uint32_t __main(void)
     //For example, a=wiiu//apps/..., in this case Haxchi will recognize at least a valid button mapping, and will always try to
     //run the associated path when pushing the button, but will fail. In this case, the fallback to HBL will never have a chance to work.
     //Checking a a recovery button combination first.
-    if(vpad_data.btns_h & (BUTTON_L | BUTTON_R | BUTTON_DOWN | BUTTON_A))
+    if((vpad_data.btns_h & BUTTON_L) &&  (vpad_data.btns_h & BUTTON_R) && (vpad_data.btns_h & BUTTON_DOWN) && (vpad_data.btns_h & BUTTON_A))
     {
         strcpy((void*)0xF5E70000,"/vol/external01/recovery.elf");
         goto fileEnd;