Merge remote-tracking branch 'upstream/master' into hdzero-osd

emuflight · Dec 19, 2023 · c973d37 · c973d37
2 parents 074f4b0 + 245dad4
commit c973d37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,7 +111,7 @@ jobs:
 
       - name: Upload Artifacts
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: EmuConfigurator-${{ github.ACTOR }}-${{ github.RUN_NUMBER }}-Linux
           path: |
@@ -120,13 +120,13 @@ jobs:
             release/*.zip
       - name: Upload Artifacts
         if: ${{ startsWith(matrix.os, 'macos') }}
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: EmuConfigurator-${{ github.ACTOR }}-${{ github.RUN_NUMBER }}-OSX
           path: release/*.dmg
       - name: Upload Artifacts
         if: ${{ startsWith(matrix.os, 'windows') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: EmuConfigurator-${{ github.ACTOR }}-${{ github.RUN_NUMBER }}-Windows
           path: |
@@ -155,7 +155,7 @@ jobs:
         continue-on-error: true
 
       - name: download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: ./Artifacts
         continue-on-error: false

diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js
@@ -2588,6 +2588,14 @@ TABS.osd.initialize = function (callback) {
                         }
                     }
 
+                    if ( numberOfProfiles === 1) {
+                        osdProfileSelector_e.hide();
+                        $('.osdprofile-selected-container').hide();
+                    } else {
+                        osdProfileSelector_e.show();
+                        $('.osdprofile-selected-container').show();
+                    }
+
                     // Select the current OSD profile
                     osdProfileActive_e.val(OSD.data.osd_profiles.selected);