CI: Default to flatpak beta branch

.github/workflows/cron_publish_flatpak.yml

@@ -43,7 +43,7 @@ jobs:
       compiler: clang
       cmakeflags: ""
       publish: true
-      branch: stable
       fetchTags: true
+      stableBuild: false
     secrets: inherit
 

.github/workflows/linux_build_flatpak.yml

@@ -23,10 +23,6 @@ on:
       cmakeflags:
         required: true
         type: string
-      branch:
-        required: false
-        type: string
-        default: "stable"
       publish:
         required: false
         type: boolean
@@ -98,7 +94,8 @@ jobs:
         run: |
           flatpak-builder-lint manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
 
-      - name: Build Flatpak
+      - name: Build Flatpak (beta)
+        if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
         uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
@@ -108,17 +105,33 @@ jobs:
           build-bundle: true
           verbose: true
           mirror-screenshots-url: https://dl.flathub.org/media
-          branch: ${{ inputs.branch }}
+          branch: beta
           cache: true
           restore-cache: true
           cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
 
+      - name: Build Flatpak (stable)
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        with:
+          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
+          upload-artifact: false
+          manifest-path: .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+          arch: x86_64
+          build-bundle: true
+          verbose: true
+          mirror-screenshots-url: https://dl.flathub.org/media
+          branch: stable
+          cache: true
+          restore-cache: true
+          cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
+  
       #- name: Validate build
       #  run: |
       #    flatpak-builder-lint repo repo
 
-      - name: Push to Flathub beta
-        if: inputs.publish == true && inputs.branch == 'beta'
+      - name: Push to Flathub (beta)
+        if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
         uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
@@ -126,8 +139,8 @@ jobs:
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
           build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-      - name: Push to Flathub stable
-        if: inputs.publish == true && inputs.branch == 'stable'
+      - name: Push to Flathub (stable)
+        if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
         uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/

.github/workflows/release_cut_new.yml

@@ -114,7 +114,6 @@ jobs:
       artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
-      branch: "stable"
       publish: false
       fetchTags: true
       stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}

pcsx2/DebugTools/DisR5900asm.cpp

@@ -1071,7 +1071,7 @@ void MTSAH( std::string& output )   { _sap("mtsah\t%s, 0x%04X") GPR_REG[DECODE_R
 
 
 //***************************SPECIAL 2 CPU OPCODES*******************
-const char* pmfhl_sub[] = {"lw", "uw", "slw", "lh", "sh", "??", "??"};
+const char* pmfhl_sub[] = {"lw", "uw", "slw", "lh", "sh", "??", "??", "??"};
 
 void MADD( std::string& output )    { _sap("madd\t%s, %s %s")        GPR_REG[DECODE_RD],GPR_REG[DECODE_RS], GPR_REG[DECODE_RT]); }
 void MADDU( std::string& output )   { _sap("maddu\t%s, %s %s")       GPR_REG[DECODE_RD],GPR_REG[DECODE_RS], GPR_REG[DECODE_RT]);}

pcsx2/Patch.cpp

@@ -178,7 +178,8 @@ namespace Patch
 	static PatchList s_cheat_patches;
 
 	static ActivePatchList s_active_patches;
-	static std::vector<DynamicPatch> s_active_dynamic_patches;
+	static std::vector<DynamicPatch> s_active_gamedb_dynamic_patches;
+	static std::vector<DynamicPatch> s_active_pnach_dynamic_patches;
 	static EnablePatchList s_enabled_cheats;
 	static EnablePatchList s_enabled_patches;
 	static u32 s_patches_crc;
@@ -631,7 +632,7 @@ u32 Patch::EnablePatches(const PatchList& patches, const EnablePatchList& enable
 
 		for (const DynamicPatch& dp : p.dpatches)
 		{
-			s_active_dynamic_patches.push_back(dp);
+			s_active_pnach_dynamic_patches.push_back(dp);
 		}
 
 		if (p.override_aspect_ratio.has_value())
@@ -699,7 +700,7 @@ void Patch::UpdateActivePatches(bool reload_enabled_list, bool verbose, bool ver
 	s_active_patches.clear();
 	s_override_aspect_ratio.reset();
 	s_override_interlace_mode.reset();
-	s_active_dynamic_patches.clear();
+	s_active_pnach_dynamic_patches.clear();
 
 	SmallString message;
 	u32 gp_count = 0;
@@ -801,7 +802,8 @@ void Patch::UnloadPatches()
 	s_override_aspect_ratio = {};
 	s_patches_crc = 0;
 	s_active_patches = {};
-	s_active_dynamic_patches = {};
+	s_active_pnach_dynamic_patches = {};
+	s_active_gamedb_dynamic_patches = {};
 	s_enabled_patches = {};
 	s_enabled_cheats = {};
 	decltype(s_cheat_patches)().swap(s_cheat_patches);
@@ -1027,14 +1029,16 @@ void Patch::ApplyLoadedPatches(patch_place_type place)
 
 void Patch::ApplyDynamicPatches(u32 pc)
 {
-	for (const auto& dynpatch : s_active_dynamic_patches)
+	for (const auto& dynpatch : s_active_pnach_dynamic_patches)
+		ApplyDynaPatch(dynpatch, pc);
+	for (const auto& dynpatch : s_active_gamedb_dynamic_patches)
 		ApplyDynaPatch(dynpatch, pc);
 }
 
 void Patch::LoadDynamicPatches(const std::vector<DynamicPatch>& patches)
 {
 	for (const DynamicPatch& it : patches)
-		s_active_dynamic_patches.push_back(it);
+		s_active_gamedb_dynamic_patches.push_back(it);
 }
 
 static u32 SkipCount = 0, IterationCount = 0;