From 0a0a2024fd374e5d75158cbae878098c04955f68 Mon Sep 17 00:00:00 2001
From: Albert Liu <45282415+ggrtk@users.noreply.github.com>
Date: Tue, 30 Jun 2020 07:51:52 -0700
Subject: [PATCH 1/3] SDLControllerInterface: Prefer cbutton.which for button
 events

Functionally the same as caxis.which due to SDL_Event union, but prefer
using SDL_ControllerButtonEvent members for button events.
---
 src/frontend-common/sdl_controller_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend-common/sdl_controller_interface.cpp b/src/frontend-common/sdl_controller_interface.cpp
index a2c54ed52..fab613b22 100644
--- a/src/frontend-common/sdl_controller_interface.cpp
+++ b/src/frontend-common/sdl_controller_interface.cpp
@@ -319,7 +319,7 @@ bool SDLControllerInterface::HandleControllerButtonEvent(const SDL_Event* ev)
   Log_DebugPrintf("controller %d button %d %s", ev->cbutton.which, ev->cbutton.button,
                   ev->cbutton.state == SDL_PRESSED ? "pressed" : "released");
 
-  auto it = GetControllerDataForJoystickId(ev->caxis.which);
+  auto it = GetControllerDataForJoystickId(ev->cbutton.which);
   if (it == m_controllers.end())
     return false;
 

From 0a65fe415652655cc07a436cd99876214d70fd8e Mon Sep 17 00:00:00 2001
From: Albert Liu <45282415+ggrtk@users.noreply.github.com>
Date: Tue, 30 Jun 2020 23:00:07 -0700
Subject: [PATCH 2/3] GitHub Actions: Update to checkout action v2.3.1 with
 fetch-depth: 0

Checkout v2+ checks out a local branch rather than a detached head.
Branch name for releases should now be master instead of HEAD.
---
 .github/workflows/rolling-release.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index fc2d804c0..e63fddaba 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -10,8 +10,9 @@ jobs:
   windows-build:
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.3.1
       with:
+        fetch-depth: 0
         submodules: true
 
     - name: Compile release build
@@ -56,7 +57,9 @@ jobs:
   linux-build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.3.1
+      with:
+        fetch-depth: 0
 
     - name: Install packages
       shell: bash

From e581ecd9c4f4ee48668f11c8bf0ae245977752a6 Mon Sep 17 00:00:00 2001
From: Albert Liu <45282415+ggrtk@users.noreply.github.com>
Date: Thu, 2 Jul 2020 17:36:37 -0700
Subject: [PATCH 3/3] README.md: Add LibCrypt and SBI info

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 4fff36585..0efad7aa1 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,10 @@ Alternatively, the region checking can be disabled in the console options tab. T
 
 Mismatching the disc and console regions with the check disabled is supported, but may break games if they are patching the BIOS and expecting specific content.
 
+### LibCrypt protection and SBI files
+
+A number of PAL region games use LibCrypt protection, requiring additional CD subchannel information to run properly. For these games, make sure that the CD image and its corresponding SBI (.sbi) file have the same name and are placed in the same directory. DuckStation will automatically load the SBI file when it is found next to the CD image.
+
 ## Building
 
 ### Windows