Fix MSI signing

Don't require SIGNTOOL_PARAMS to contain the 'sign' command
Require SIGNTOOL_PARAMS to be set externally
2026-10-12 11:34:01 +00:00 · 2026-10-03 19:02:01 -05:00 · 2026-10-03 18:37:39 -05:00 · 2026-10-03 18:30:08 -05:00 · 2026-10-03 16:32:35 -05:00 · 2026-10-03 13:37:58 -05:00
248 changed files with 23428 additions and 14092 deletions
@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"
@@ -0,0 +1,166 @@
+---
+name: Build - Linux AppImage
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      ci_version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    env:
+      CI_VERSION: ${{ inputs.ci_version }}
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v5
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+
+      - name: Setup environment
+        run: |
+          wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
+          sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.4.313-jammy.list https://packages.lunarg.com/vulkan/1.4.313/lunarg-vulkan-1.4.313-jammy.list
+          sudo apt update
+          sudo apt install -y qt6-base-dev qt6-declarative-dev libqt6svg6-dev qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-layouts \
+            qml6-module-qtqml-workerscript qml6-module-qtquick-window qml6-module-qtquick python3-pip nasm libgbm-dev libdrm-dev libfreetype-dev libasound2-dev \
+            libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev \
+            libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev libxcb-dri3-dev libx11-xcb-dev \
+            libxfixes-dev libxtst-dev wayland-protocols libopus-dev libvdpau-dev libgl-dev libpipewire-0.3-dev liburing-dev vulkan-sdk cmake
+          sudo pip3 install meson
+          mkdir -p dep_root/{bin,include,lib}
+          echo "DEP_ROOT=$PWD/dep_root" >> "${GITHUB_ENV}"
+          echo "$PWD/dep_root/bin" >> "${GITHUB_PATH}"
+
+      - name: Checkout SDL3
+        uses: actions/checkout@v5
+        with:
+          repository: libsdl-org/SDL
+          ref: release-3.4.18
+          path: deps/SDL
+
+      - name: Build SDL3
+        working-directory: deps/SDL
+        run: |
+          cmake -DSDL_KMSDRM=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_INSTALL_DOCS=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -S . -B build
+          cmake --build build -j
+          sudo cmake --install build
+
+      - name: Checkout sdl2-compat
+        uses: actions/checkout@v5
+        with:
+          repository: libsdl-org/sdl2-compat
+          ref: release-2.32.74
+          path: deps/sdl2-compat
+
+      - name: Build sdl2-compat
+        working-directory: deps/sdl2-compat
+        run: |
+          cmake -DSDL2COMPAT_TESTS=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -S . -B build
+          cmake --build build -j
+          sudo cmake --install build
+
+      - name: Checkout SDL_ttf
+        uses: actions/checkout@v5
+        with:
+          repository: libsdl-org/SDL_ttf
+          ref: a883e490e30fb44a5336ea3dcb990c6982c5216f
+          path: deps/SDL_ttf
+          submodules: 'recursive'
+
+      - name: Build SDL_ttf
+        working-directory: deps/SDL_ttf
+        run: |
+          ./autogen.sh
+          ./configure
+          make -j$(nproc)
+          sudo make install
+
+      - name: Checkout libva
+        uses: actions/checkout@v5
+        with:
+          repository: intel/libva
+          ref: 2.24.1
+          path: deps/libva
+
+      - name: Build libva
+        working-directory: deps/libva
+        run: |
+          ./autogen.sh
+          ./configure --enable-x11=yes --enable-glx=no --enable-drm=no --enable-wayland=no
+          make -j$(nproc)
+          sudo make install
+
+      - name: Checkout libplacebo
+        uses: actions/checkout@v5
+        with:
+          repository: haasn/libplacebo
+          ref: 92b5ac6db79f4d680eb656692f7bf51e9606f42a
+          path: deps/libplacebo
+          submodules: 'recursive'
+
+      - name: Build libplacebo
+        working-directory: deps/libplacebo
+        run: |
+          git apply ../../app/deploy/linux/appimage/*.patch
+          meson setup build -Dvulkan=enabled -Dopengl=disabled -Ddemos=false
+          ninja -C build
+          sudo ninja install -C build
+
+      - name: Build dav1d
+        working-directory: deps
+        env:
+          DAV1D_VER: 1.5.4
+        run: |
+          git clone --branch $DAV1D_VER --depth 1 https://code.videolan.org/videolan/dav1d.git
+          pushd dav1d
+          meson setup build -Ddefault_library=static -Dbuildtype=release -Denable_tools=false -Denable_tests=false
+          ninja -C build
+          sudo ninja install -C build
+          popd
+
+      - name: Checkout FFmpeg
+        uses: actions/checkout@v5
+        with:
+          repository: FFmpeg/FFmpeg
+          ref: n9.0.2
+          path: deps/FFmpeg
+
+      - name: Build FFmpeg
+        working-directory: deps/FFmpeg
+        run: |
+          ./configure --enable-pic --enable-lto --disable-static --enable-shared --disable-all --disable-autodetect \
+            --enable-avcodec --enable-avformat --enable-swscale \
+            --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 \
+            --enable-vaapi --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi \
+            --enable-vdpau --enable-hwaccel=h264_vdpau  --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau \
+            --enable-libdrm --enable-vulkan --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --enable-hwaccel=av1_vulkan \
+            --enable-libdav1d --enable-decoder=libdav1d
+          make -j$(nproc)
+          sudo make install
+
+      - name: Install linuxdeploy
+        working-directory: dep_root/bin
+        run: |
+          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+          wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+          chmod +x linuxdeploy*.AppImage
+
+      - name: Build Binaries
+        run: |
+          sudo ldconfig
+          scripts/build-appimage.sh
+
+      - name: Upload Binaries
+        uses: actions/upload-artifact@v6
+        with:
+          name: Moonlight-LinuxAppImage-${{ env.CI_VERSION }}
+          path: build/installer-release/Moonlight-${{ env.CI_VERSION }}-x86_64.AppImage
+          compression-level: 0
+          if-no-files-found: error
@@ -0,0 +1,41 @@
+---
+name: Build - Steam Link
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      ci_version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    env:
+      CI_VERSION: ${{ inputs.ci_version }}
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v5
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+
+      - name: Checkout Steam Link SDK
+        uses: actions/checkout@v5
+        with:
+          repository: ValveSoftware/steamlink-sdk
+          path: steamlink-sdk
+          fetch-depth: 1
+
+      - name: Build binaries
+        run: STEAMLINK_SDK_PATH=$PWD/steamlink-sdk scripts/build-steamlink-app.sh
+
+      - name: Upload Binaries
+        uses: actions/upload-artifact@v6
+        with:
+          name: Moonlight-SteamLink-${{ env.CI_VERSION }}
+          path: build/deploy-release/*
+          if-no-files-found: error
@@ -0,0 +1,126 @@
+---
+name: Build - Windows and macOS
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      ci_version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    env:
+      CI_VERSION: ${{ inputs.ci_version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Windows
+          - os: windows-2025
+            qt_version: 6.12.0
+          # macOS
+          - os: macos-26
+            qt_version: 6.11.2
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v5
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+
+      - name: Download dependencies (Windows)
+        if: runner.os == 'Windows'
+        run: powershell ./setup-deps.ps1
+
+      - name: Install create-dmg (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install node
+          npm install --global create-dmg
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          cache: true
+          set-env: ${{ runner.os != 'Windows' }}
+          add-tools-to-path: ${{ runner.os != 'Windows' }}
+          tools: ${{ runner.os == 'Windows' && 'tools_qtcreator_gui' || '' }}
+          version: ${{ matrix.qt_version }}
+          aqtsource: 'git+https://github.com/miurahr/aqtinstall.git@073e34d7c2ab4ae6961ed7cca690b3abd5ba5a7e'
+
+      - name: Install Qt ARM64 (Windows)
+        if: runner.os == 'Windows'
+        uses: jurplel/install-qt-action@v4
+        with:
+          cache: true
+          set-env: false
+          add-tools-to-path: false
+          arch: win64_msvc2022_arm64_cross_compiled
+          version: ${{ matrix.qt_version }}
+
+      - name: Build x64 binaries (Windows)
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: |
+          set "PATH=%QT_PATH%;%PATH%"
+          scripts\build-arch.bat Release x64
+        env:
+          QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2022_64\bin
+
+      - name: Build ARM64 binaries (Windows)
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: |
+          set "PATH=%QT_PATH%;%PATH%"
+          scripts\build-arch.bat Release arm64
+        env:
+          QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2022_arm64\bin
+
+      - name: Build Package
+        shell: pwsh
+        run: |
+          if ($Env:RUNNER_OS -eq "Windows") {
+            cmd /c scripts\generate-bundle.bat Release
+          } else {
+            bash scripts/generate-dmg.sh Release
+          }
+
+      - name: Upload Binaries (Windows x64)
+        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows'
+        with:
+          name: Moonlight-${{ runner.os }}-x64-${{ env.CI_VERSION }}
+          path: build/deploy-x64-release/*
+          if-no-files-found: error
+
+      - name: Upload Binaries (Windows arm64)
+        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows'
+        with:
+          name: Moonlight-${{ runner.os }}-arm64-${{ env.CI_VERSION }}
+          path: build/deploy-arm64-release/*
+          if-no-files-found: error
+
+      - name: Upload Binaries (macOS)
+        uses: actions/upload-artifact@v6
+        if: runner.os == 'macOS'
+        with:
+          name: Moonlight-${{ runner.os }}-${{ env.CI_VERSION }}
+          path: build/installer-Release/*.dmg
+          compression-level: 0
+          if-no-files-found: error
+
+      - name: Upload Symbols
+        uses: actions/upload-artifact@v6
+        with:
+          name: zDevDbgSyms-${{ runner.os }}-${{ env.CI_VERSION }}
+          path: |
+            build/installer-*/*.dsym/*
+            build/symbols-*/*.pdb
+          if-no-files-found: error
@@ -0,0 +1,45 @@
+---
+name: Build
+permissions:
+  contents: read
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      ci_version: ${{ steps.set-ci-version.outputs.ci_version }}
+    steps:
+      - name: Set CI version
+        id: set-ci-version
+        shell: bash
+        run: |
+          CI_VERSION=`echo ${GITHUB_SHA} | cut -c1-6`
+          echo "ci_version=${CI_VERSION}" >> "${GITHUB_OUTPUT}"
+
+  build-appimage:
+    needs: setup
+    uses: ./.github/workflows/build-appimage.yml
+    with:
+      ci_version: ${{ needs.setup.outputs.ci_version }}
+
+  build-steamlink:
+    needs: setup
+    uses: ./.github/workflows/build-steamlink.yml
+    with:
+      ci_version: ${{ needs.setup.outputs.ci_version }}
+
+  build-windows-macos:
+    needs: setup
+    uses: ./.github/workflows/build-win-mac.yml
+    with:
+      ci_version: ${{ needs.setup.outputs.ci_version }}
@@ -2,6 +2,8 @@


 **/.vs/
+.vscode/
 build/
+libs/
 config.tests/*/.qmake.stash
 config.tests/*/Makefile
@@ -7,13 +7,3 @@
 [submodule "app/SDL_GameControllerDB"]
 	path = app/SDL_GameControllerDB
 	url = https://github.com/gabomdq/SDL_GameControllerDB.git
-[submodule "soundio/libsoundio"]
-	path = soundio/libsoundio
-	url = https://github.com/cgutman/libsoundio.git
-[submodule "h264bitstream/h264bitstream"]
-	path = h264bitstream/h264bitstream
-	url = https://github.com/aizvorski/h264bitstream.git
-[submodule "libs"]
-	path = libs
-	url = https://github.com/cgutman/moonlight-qt-prebuilts.git
-	shallow = true
@@ -207,6 +207,28 @@ private:
        // Since the RTSS OSD doesn't even work with DXVA2, we'll just block the hooks entirely.
        L"RTSSHooks.dll",
        L"RTSSHooks64.dll",
+
+        // Bandicam's Vulkan layer DLL crashes during destruction of the Vulkan swapchain
+        // bdcamvk64+0x10b73:
+        // 00007ffa`be3b0b73 498b5630        mov     rdx,qword ptr [r14+30h] ds:00000000`00000030=????????????????
+        //
+        // bdcamvk64+0x10b73
+        // libplacebo_357!vk_sw_destroy+0x14f [D:\a\moonlight-deps\moonlight-deps\libplacebo\src\vulkan\swapchain.c @ 460]
+        // libplacebo_357!pl_swapchain_destroy+0x1a [D:\a\moonlight-deps\moonlight-deps\libplacebo\src\swapchain.c @ 30]
+        // Moonlight!PlVkRenderer::~PlVkRenderer+0x159 [D:\a\moonlight-qt\app\streaming\video\ffmpeg-renderers\plvk.cpp @ 140]
+        // Moonlight!PlVkRenderer::`scalar deleting destructor'+0x17
+        // Moonlight!FFmpegVideoDecoder::reset+0x203 [D:\a\moonlight-qt\app\streaming\video\ffmpeg.cpp @ 301]
+        // Moonlight!FFmpegVideoDecoder::~FFmpegVideoDecoder+0x22 [D:\a\moonlight-qt\app\streaming\video\ffmpeg.cpp @ 257]
+        // Moonlight!FFmpegVideoDecoder::`scalar deleting destructor'+0x17
+        // Moonlight!Session::getDecoderInfo+0x19a [D:\a\moonlight-qt\app\streaming\session.cpp @ 415]
+        // Moonlight!SystemProperties::querySdlVideoInfoInternal+0x134 [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 161]
+        // Moonlight!SystemProperties::querySdlVideoInfo+0x97 [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 123]
+        // Moonlight!SystemProperties::SystemProperties+0x4bf [D:\a\moonlight-qt\app\backend\systemproperties.cpp @ 75]
+        //
+        // https://github.com/moonlight-stream/moonlight-qt/issues/1425
+        // https://github.com/moonlight-stream/moonlight-qt/issues/1579
+        L"bdcamvk32.dll",
+        L"bdcamvk64.dll",
    };
 };

@@ -6,7 +6,7 @@ Moonlight also has mobile versions for [Android](https://github.com/moonlight-st

 You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-qt/).

- [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master)
+ [![Build](https://img.shields.io/github/actions/workflow/status/moonlight-stream/moonlight-qt/build.yml?branch=master)](https://github.com/moonlight-stream/moonlight-qt/actions/workflows/build.yml?query=branch%3Amaster)
 [![Downloads](https://img.shields.io/github/downloads/moonlight-stream/moonlight-qt/total)](https://github.com/moonlight-stream/moonlight-qt/releases)
 [![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-qt/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-qt/)

@@ -31,6 +31,9 @@ You can follow development on our [Discord server](https://moonlight-stream.org/
 - [Experimental RISC-V Debian packages](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-RISC%E2%80%90V-Single-Board-Computers)
 - [NVIDIA Jetson and Nintendo Switch (Ubuntu L4T)](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-Linux4Tegra-(L4T)-Ubuntu)

+### Nightly Builds
+- [Downloads](https://nightly.link/moonlight-stream/moonlight-qt/workflows/build/master)
+
 #### Special Thanks

 [![Hosted By: Cloudsmith](https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith&style=flat-square)](https://cloudsmith.com)
@@ -40,8 +43,8 @@ Hosting for Moonlight's Debian and L4T package repositories is graciously provid
 ## Building

 ### Windows Build Requirements
-* Qt 6.7 SDK or later (earlier versions may work but are not officially supported)
-* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) (Community edition is fine)
+* Qt 6.11 SDK or later (earlier versions may work but are not officially supported)
+* [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) (Community edition is fine)
 * Select **MSVC** option during Qt installation. MinGW is not supported.
 * [7-Zip](https://www.7-zip.org/) (only if building installers for non-development PCs)
 * Graphics Tools (only if running debug builds)
@@ -49,18 +52,18 @@ Hosting for Moonlight's Debian and L4T package repositories is graciously provid
  * Alternatively, run `dism /online /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0` and reboot.

 ### macOS Build Requirements
-* Qt 6.7 SDK or later (earlier versions may work but are not officially supported)
-* Xcode 14 or later (earlier versions may work but are not officially supported)
+* Qt 6.11 SDK or later (earlier versions may work but are not officially supported)
+* Xcode 15 or later (earlier versions may work but are not officially supported)
 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs)

 ### Linux/Unix Build Requirements
-* Qt 6 is recommended, but Qt 5.9 or later is also supported (replace `qmake6` with `qmake` when using Qt 5).
+* Qt 6 is recommended, but Qt 5.12 or later is also supported (replace `qmake6` with `qmake` when using Qt 5).
 * GCC or Clang
 * FFmpeg 4.0 or later
 * Install the required packages:
  * Debian/Ubuntu:
    * Base Requirements: `libegl1-mesa-dev libgl1-mesa-dev libopus-dev libsdl2-dev libsdl2-ttf-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libva-dev libvdpau-dev libxkbcommon-dev wayland-protocols libdrm-dev`
-    * Qt 6 (Recommended): `qt6-base-dev qt6-declarative-dev libqt6svg6-dev qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml6-module-qtquick-window qml6-module-qtquick`
+    * Qt 6 (Recommended): `qt6-base-dev qt6-declarative-dev libqt6svg6-dev qt6-wayland qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml6-module-qtquick-window qml6-module-qtquick`
    * Qt 5: `qtbase5-dev qt5-qmake qtdeclarative5-dev qtquickcontrols2-5-dev qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-window2 qml-module-qtquick2 qtwayland5`
  * RedHat/Fedora (RPM Fusion repo required):
    * Base Requirements: `openssl-devel SDL2-devel SDL2_ttf-devel ffmpeg-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel libdrm-devel`
@@ -72,18 +75,33 @@ Hosting for Moonlight's Debian and L4T package repositories is graciously provid
 * [Steam Link SDK](https://github.com/ValveSoftware/steamlink-sdk) cloned on your build system
 * STEAMLINK_SDK_PATH environment variable set to the Steam Link SDK path

+**Steam Link Hardware Limitations**  
+Moonlight builds for Steam Link are subject to hardware limitations of the Steam Link device:
+* Maximum resolution: **1080p (1920x1080)**
+* Maximum framerate: **60 FPS**
+* Maximum video bitrate: **40 Mbps**
+* **HDR streaming is not supported** on the original hardware
+
+### Docker containers
+If you want to use Docker for building, look at [this repo](https://github.com/cgutman/moonlight-packaging) containing canonical containers
+for different architectures, which handle building deps and extra linking for you.
+
 ### Build Setup Steps
 1. Install the latest Qt SDK (and optionally, the Qt Creator IDE) from https://www.qt.io/download
    * You can install Qt via Homebrew on macOS, but you will need to use `brew install qt --with-debug` to be able to create debug builds of Moonlight.
-    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.9 or later.
+    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.12 or later.
    * This step is not required for building on Steam Link, because the Steam Link SDK includes Qt 5.14.
-2. Run `git submodule update --init --recursive` from within `moonlight-qt/`
+2. Download submodules and dependencies
+    * Run `git submodule update --init --recursive` from within `moonlight-qt/`.
+    * On Windows and macOS, you must also run `setup-deps.ps1` (Windows) or `setup-deps.py` (macOS).
+    * Perform these steps each time you pull new changes from the Git repository.
 3. Open the project in Qt Creator or build from qmake on the command line.
    * To build a binary for use on non-development machines, use the scripts in the `scripts` folder.
        * For Windows builds, use `scripts\build-arch.bat` and `scripts\generate-bundle.bat`. Execute these scripts from the root of the repository within a Qt command prompt. Ensure  7-Zip binary directory is on your `%PATH%`.
        * For macOS builds, use `scripts/generate-dmg.sh`. Execute this script from the root of the repository and ensure Qt's `bin` folder is in your `$PATH`.
        * For Steam Link builds, run `scripts/build-steamlink-app.sh` from the root of the repository.
-    * To build from the command line for development use on macOS or Linux, run `qmake6 moonlight-qt.pro` then `make debug` or `make release`
+    * To build from the command line for development use on macOS or Linux, run `qmake6 moonlight-qt.pro` then `make debug` or `make release`.
+        * The final binary will be placed in `app/moonlight`.
    * To create an embedded build for a single-purpose device, use `qmake6 "CONFIG+=embedded" moonlight-qt.pro` and build normally.
        * This build will lack windowed mode, Discord/Help links, and other features that don't make sense on an embedded device.
        * For platforms with poor GPU performance, add `"CONFIG+=gpuslow"` to prefer direct KMSDRM rendering over GL/Vulkan renderers. Direct KMSDRM rendering can use dedicated YUV/RGB conversion and scaling hardware rather than slower GPU shaders for these operations.
@@ -2,8 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>GCSupportsGameMode</key>
+	<true/>
 	<key>CFBundleExecutable</key>
 	<string>Moonlight</string>
+	<key>LSSupportsGameMode</key>
+	<true/>
 	<key>CFBundleGetInfoString</key>
 	<string>Stream games and other applications from another PC</string>
 	<key>CFBundleIconFile</key>
@@ -17,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>11.0.0</string>
+	<string>13.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
@@ -38,11 +42,17 @@
 	</dict>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>Moonlight uses the local network to connect to your gaming PC for streaming.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_nvstream._tcp</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>VERSION</string>
 	<key>CFBundleShortVersionString</key>
 	<string>VERSION</string>
 	<key>CFBundleDisplayName</key>
 	<string>Moonlight</string>
+    <key>LSApplicationCategoryType</key>
+	<string>public.app-category.games</string>
 </dict>
 </plist>
@@ -11,7 +11,8 @@
    <asmv3:application>
        <asmv3:windowsSettings>
            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitor</dpiAwareness>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2, permonitor</dpiAwareness>
+            <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
        </asmv3:windowsSettings>
    </asmv3:application>
    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
@@ -1,320 +0,0 @@
-#include "SDL_compat.h"
-
-#include <SDL_syswm.h>
-
-void* SDLC_Win32_GetHwnd(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_WINDOWS
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return NULL;
-    }
-
-    if (info.subsystem == SDL_SYSWM_WINDOWS) {
-        return info.info.win.window;
-    }
-#else
-    (void)window;
-#endif
-
-    return NULL;
-}
-
-void* SDLC_MacOS_GetWindow(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_COCOA
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return NULL;
-    }
-
-    if (info.subsystem == SDL_SYSWM_COCOA) {
-        return info.info.cocoa.window;
-    }
-#else
-    (void)window;
-#endif
-
-    return NULL;
-}
-
-void* SDLC_X11_GetDisplay(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_X11
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return NULL;
-    }
-
-    if (info.subsystem == SDL_SYSWM_X11) {
-        return info.info.x11.display;
-    }
-#else
-    (void)window;
-#endif
-
-    return NULL;
-}
-
-unsigned long SDLC_X11_GetWindow(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_X11
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return 0;
-    }
-
-    if (info.subsystem == SDL_SYSWM_X11) {
-        return info.info.x11.window;
-    }
-#else
-    (void)window;
-#endif
-
-    return 0;
-}
-
-void* SDLC_Wayland_GetDisplay(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_WAYLAND
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return NULL;
-    }
-
-    if (info.subsystem == SDL_SYSWM_WAYLAND) {
-        return info.info.wl.display;
-    }
-#else
-    (void)window;
-#endif
-
-    return NULL;
-}
-
-void* SDLC_Wayland_GetSurface(SDL_Window* window)
-{
-#ifdef SDL_VIDEO_DRIVER_WAYLAND
-    SDL_SysWMinfo info;
-
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return NULL;
-    }
-
-    if (info.subsystem == SDL_SYSWM_WAYLAND) {
-        return info.info.wl.surface;
-    }
-#else
-    (void)window;
-#endif
-
-    return NULL;
-}
-
-int SDLC_KMSDRM_GetFd(SDL_Window* window)
-{
-#if defined(SDL_VIDEO_DRIVER_KMSDRM) && SDL_VERSION_ATLEAST(2, 0, 15)
-    SDL_SysWMinfo info;
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return -1;
-    }
-
-    if (info.subsystem == SDL_SYSWM_KMSDRM) {
-        return info.info.kmsdrm.drm_fd;
-    }
-#else
-    (void)window;
-#endif
-
-    return -1;
-}
-
-int SDLC_KMSDRM_GetDevIndex(SDL_Window* window)
-{
-#if defined(SDL_VIDEO_DRIVER_KMSDRM) && SDL_VERSION_ATLEAST(2, 0, 15)
-    SDL_SysWMinfo info;
-    SDL_VERSION(&info.version);
-    if (!SDL_GetWindowWMInfo(window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return -1;
-    }
-
-    if (info.subsystem == SDL_SYSWM_KMSDRM) {
-        return info.info.kmsdrm.dev_index;
-    }
-#else
-    (void)window;
-#endif
-
-    return -1;
-}
-
-SDLC_VideoDriver SDLC_GetVideoDriver(void)
-{
-#if defined(SDL_VIDEO_DRIVER_WINDOWS)
-    return SDLC_VIDEO_WIN32;
-#elif defined(SDL_VIDEO_DRIVER_COCOA)
-    return SDLC_VIDEO_MACOS;
-#else
-    const char* videoDriver = SDL_GetCurrentVideoDriver();
-    if (SDL_strcmp(videoDriver, "x11") == 0) {
-        return SDLC_VIDEO_X11;
-    }
-    else if (SDL_strcmp(videoDriver, "wayland") == 0) {
-        return SDLC_VIDEO_WAYLAND;
-    }
-    else if (SDL_strcmp(videoDriver, "kmsdrm") == 0) {
-        return SDLC_VIDEO_KMSDRM;
-    }
-    else {
-        SDL_assert(0);
-        return SDLC_VIDEO_UNKNOWN;
-    }
-#endif
-}
-
-bool SDLC_IsFullscreen(SDL_Window* window)
-{
-    return !!(SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN);
-}
-
-bool SDLC_IsFullscreenExclusive(SDL_Window* window)
-{
-    return (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN;
-}
-
-bool SDLC_IsFullscreenDesktop(SDL_Window* window)
-{
-    return (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP;
-}
-
-void SDLC_EnterFullscreen(SDL_Window* window, bool exclusive)
-{
-    SDL_SetWindowFullscreen(window, exclusive ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_FULLSCREEN_DESKTOP);
-}
-
-void SDLC_LeaveFullscreen(SDL_Window* window)
-{
-    SDL_SetWindowFullscreen(window, 0);
-}
-
-SDL_Window* SDLC_CreateWindowWithFallback(const char *title,
-                                          int x, int y, int w, int h,
-                                          Uint32 requiredFlags,
-                                          Uint32 optionalFlags)
-{
-    SDL_Window* window = SDL_CreateWindow(title, x, y, w, h, requiredFlags | optionalFlags);
-    if (!window) {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                    "Failed to create window with optional flags: %s",
-                    SDL_GetError());
-
-        // Try the fallback flags now
-        window = SDL_CreateWindow(title, x, y, w, h, requiredFlags);
-    }
-
-    return window;
-}
-
-void SDLC_FlushWindowEvents(void)
-{
-    SDL_FlushEvent(SDL_WINDOWEVENT);
-}
-
-SDL_JoystickID* SDL_GetGamepads(int *count)
-{
-    int numJoysticks = SDL_NumJoysticks();
-    SDL_JoystickID* ids = SDL_calloc(numJoysticks + 1, sizeof(SDL_JoystickID));
-
-    int numGamepads = 0;
-    for (int i = 0; i < numJoysticks; i++) {
-        if (SDL_IsGameController(i)) {
-            ids[numGamepads++] = i;
-        }
-    }
-
-    if (count != NULL) {
-        *count = numGamepads;
-    }
-
-    return ids;
-}
-
-SDL_JoystickID* SDL_GetJoysticks(int *count)
-{
-    int numJoysticks = SDL_NumJoysticks();
-    SDL_JoystickID* ids = SDL_calloc(numJoysticks + 1, sizeof(SDL_JoystickID));
-
-    for (int i = 0; i < numJoysticks; i++) {
-        ids[i] = i;
-    }
-
-    if (count != NULL) {
-        *count = numJoysticks;
-    }
-
-    return ids;
-}
-
-SDL_DisplayID * SDL_GetDisplays(int *count)
-{
-    int numDisplays = SDL_GetNumVideoDisplays();
-    SDL_DisplayID* ids = SDL_calloc(numDisplays + 1, sizeof(SDL_DisplayID));
-
-    for (int i = 0; i < numDisplays; i++) {
-        ids[i] = i;
-    }
-
-    if (count != NULL) {
-        *count = numDisplays;
-    }
-
-    return ids;
-}
-
-const SDL_DisplayMode * SDL_GetWindowFullscreenMode(SDL_Window *window)
-{
-    static SDL_DisplayMode mode;
-
-    if (SDL_GetWindowDisplayMode(window, &mode) == 0) {
-        return &mode;
-    }
-    else {
-        return NULL;
-    }
-}
@@ -1,54 +1,11 @@
 //
-// Compatibility header for older versions of SDL.
+// Compatibility header for older version of SDL.
 // Include this instead of SDL.h directly.
 //

 #pragma once

 #include <SDL.h>
-#include <stdbool.h>
-
-// This is a pure C header for compatibility with SDL.h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// These SLDC_* functions and constants are special SDL-like things
-// used to abstract certain SDL2 vs SDL3 differences.
-void* SDLC_Win32_GetHwnd(SDL_Window* window);
-void* SDLC_MacOS_GetWindow(SDL_Window* window);
-void* SDLC_X11_GetDisplay(SDL_Window* window);
-unsigned long SDLC_X11_GetWindow(SDL_Window* window);
-void* SDLC_Wayland_GetDisplay(SDL_Window* window);
-void* SDLC_Wayland_GetSurface(SDL_Window* window);
-int SDLC_KMSDRM_GetFd(SDL_Window* window);
-int SDLC_KMSDRM_GetDevIndex(SDL_Window* window);
-
-typedef enum {
-    SDLC_VIDEO_UNKNOWN,
-    SDLC_VIDEO_WIN32,
-    SDLC_VIDEO_MACOS,
-    SDLC_VIDEO_X11,
-    SDLC_VIDEO_WAYLAND,
-    SDLC_VIDEO_KMSDRM,
-} SDLC_VideoDriver;
-SDLC_VideoDriver SDLC_GetVideoDriver();
-
-bool SDLC_IsFullscreen(SDL_Window* window);
-bool SDLC_IsFullscreenExclusive(SDL_Window* window);
-bool SDLC_IsFullscreenDesktop(SDL_Window* window);
-void SDLC_EnterFullscreen(SDL_Window* window, bool exclusive);
-void SDLC_LeaveFullscreen(SDL_Window* window);
-
-SDL_Window* SDLC_CreateWindowWithFallback(const char *title,
-                                          int x, int y, int w, int h,
-                                          Uint32 requiredFlags,
-                                          Uint32 optionalFlags);
-
-void SDLC_FlushWindowEvents();
-
-#define SDLC_SUCCESS(x) ((x) == 0)
-#define SDLC_FAILURE(x) ((x) != 0)

 // SDL_FRect wasn't added until 2.0.10
 #if !SDL_VERSION_ATLEAST(2, 0, 10)
@@ -61,10 +18,6 @@ typedef struct SDL_FRect
 } SDL_FRect;
 #endif

-#ifndef SDL_THREAD_PRIORITY_TIME_CRITICAL
-#define SDL_THREAD_PRIORITY_TIME_CRITICAL SDL_THREAD_PRIORITY_HIGH
-#endif
-
 #ifndef SDL_HINT_VIDEO_X11_FORCE_EGL
 #define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL"
 #endif
@@ -112,192 +65,3 @@ typedef struct SDL_FRect
 #ifndef SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP
 #define SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP "SDL_VIDEO_WAYLAND_EMULATE_MOUSE_WARP"
 #endif
-
-// SDL3 renamed hints
-#define SDL_HINT_VIDEO_FORCE_EGL SDL_HINT_VIDEO_X11_FORCE_EGL
-
-// Events
-#define SDL_EVENT_QUIT SDL_QUIT
-#define SDL_EVENT_CLIPBOARD_UPDATE SDL_CLIPBOARDUPDATE
-#define SDL_EVENT_GAMEPAD_ADDED SDL_CONTROLLERDEVICEADDED
-#define SDL_EVENT_GAMEPAD_REMAPPED SDL_CONTROLLERDEVICEREMAPPED
-#define SDL_EVENT_GAMEPAD_REMOVED SDL_CONTROLLERDEVICEREMOVED
-#define SDL_EVENT_GAMEPAD_SENSOR_UPDATE SDL_CONTROLLERSENSORUPDATE
-#define SDL_EVENT_GAMEPAD_BUTTON_DOWN SDL_CONTROLLERBUTTONDOWN
-#define SDL_EVENT_GAMEPAD_BUTTON_UP SDL_CONTROLLERBUTTONUP
-#define SDL_EVENT_GAMEPAD_AXIS_MOTION SDL_CONTROLLERAXISMOTION
-#define SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN SDL_CONTROLLERTOUCHPADDOWN
-#define SDL_EVENT_GAMEPAD_TOUCHPAD_UP SDL_CONTROLLERTOUCHPADUP
-#define SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION SDL_CONTROLLERTOUCHPADMOTION
-#define SDL_EVENT_JOYSTICK_ADDED SDL_JOYDEVICEADDED
-#define SDL_EVENT_JOYSTICK_REMOVED SDL_JOYDEVICEREMOVED
-#define SDL_EVENT_JOYSTICK_BATTERY_UPDATED SDL_JOYBATTERYUPDATED
-#define SDL_EVENT_FINGER_DOWN SDL_FINGERDOWN
-#define SDL_EVENT_FINGER_MOTION SDL_FINGERMOTION
-#define SDL_EVENT_FINGER_UP SDL_FINGERUP
-#define SDL_EVENT_KEY_DOWN SDL_KEYDOWN
-#define SDL_EVENT_KEY_UP SDL_KEYUP
-#define SDL_EVENT_MOUSE_BUTTON_DOWN SDL_MOUSEBUTTONDOWN
-#define SDL_EVENT_MOUSE_BUTTON_UP SDL_MOUSEBUTTONUP
-#define SDL_EVENT_MOUSE_MOTION SDL_MOUSEMOTION
-#define SDL_EVENT_MOUSE_WHEEL SDL_MOUSEWHEEL
-#define SDL_EVENT_RENDER_DEVICE_RESET SDL_RENDER_DEVICE_RESET
-#define SDL_EVENT_RENDER_TARGETS_RESET SDL_RENDER_TARGETS_RESET
-#define SDL_EVENT_USER SDL_USEREVENT
-
-#define SDL_EVENT_WINDOW_FOCUS_GAINED SDL_WINDOWEVENT_FOCUS_GAINED
-#define SDL_EVENT_WINDOW_FOCUS_LOST SDL_WINDOWEVENT_FOCUS_LOST
-#define SDL_EVENT_WINDOW_MOUSE_ENTER SDL_WINDOWEVENT_ENTER
-#define SDL_EVENT_WINDOW_MOUSE_LEAVE SDL_WINDOWEVENT_LEAVE
-#define SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED SDL_WINDOWEVENT_SIZE_CHANGED
-#define SDL_EVENT_WINDOW_SHOWN SDL_WINDOWEVENT_SHOWN
-#define SDL_EVENT_WINDOW_DISPLAY_CHANGED SDL_WINDOWEVENT_DISPLAY_CHANGED
-
-#define SDL_BUTTON_MASK(x) SDL_BUTTON(x)
-
-#define gbutton cbutton
-#define gaxis caxis
-#define gdevice cdevice
-#define gsensor csensor
-#define gtouchpad ctouchpad
-
-#define fingerID fingerId
-#define touchID touchId
-
-#define KEY_DOWN(x) ((x)->state == SDL_PRESSED)
-#define KEY_KEY(x) ((x)->keysym.sym)
-#define KEY_MOD(x) ((x)->keysym.mod)
-#define KEY_SCANCODE(x) ((x)->keysym.scancode)
-
-// Gamepad
-#define SDL_INIT_GAMEPAD SDL_INIT_GAMECONTROLLER
-
-#define SDL_GAMEPAD_BUTTON_SOUTH SDL_CONTROLLER_BUTTON_A
-#define SDL_GAMEPAD_BUTTON_EAST SDL_CONTROLLER_BUTTON_B
-#define SDL_GAMEPAD_BUTTON_WEST SDL_CONTROLLER_BUTTON_X
-#define SDL_GAMEPAD_BUTTON_NORTH SDL_CONTROLLER_BUTTON_Y
-#define SDL_GAMEPAD_BUTTON_LEFT_SHOULDER SDL_CONTROLLER_BUTTON_LEFTSHOULDER
-#define SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
-#define SDL_GAMEPAD_BUTTON_DPAD_UP SDL_CONTROLLER_BUTTON_DPAD_UP
-#define SDL_GAMEPAD_BUTTON_DPAD_DOWN SDL_CONTROLLER_BUTTON_DPAD_DOWN
-#define SDL_GAMEPAD_BUTTON_DPAD_LEFT SDL_CONTROLLER_BUTTON_DPAD_LEFT
-#define SDL_GAMEPAD_BUTTON_DPAD_RIGHT SDL_CONTROLLER_BUTTON_DPAD_RIGHT
-#define SDL_GAMEPAD_BUTTON_START SDL_CONTROLLER_BUTTON_START
-#define SDL_GAMEPAD_BUTTON_TOUCHPAD SDL_CONTROLLER_BUTTON_TOUCHPAD
-
-#define SDL_GAMEPAD_BINDTYPE_AXIS SDL_CONTROLLER_BINDTYPE_AXIS
-#define SDL_GAMEPAD_BINDTYPE_BUTTON SDL_CONTROLLER_BINDTYPE_BUTTON
-#define SDL_GAMEPAD_BINDTYPE_HAT SDL_CONTROLLER_BINDTYPE_HAT
-#define SDL_GAMEPAD_BINDTYPE_NONE SDL_CONTROLLER_BINDTYPE_NONE
-
-#define SDL_GAMEPAD_AXIS_LEFTX SDL_CONTROLLER_AXIS_LEFTX
-#define SDL_GAMEPAD_AXIS_LEFTY SDL_CONTROLLER_AXIS_LEFTY
-#define SDL_GAMEPAD_AXIS_RIGHTX SDL_CONTROLLER_AXIS_RIGHTX
-#define SDL_GAMEPAD_AXIS_RIGHTY SDL_CONTROLLER_AXIS_RIGHTY
-#define SDL_GAMEPAD_AXIS_LEFT_TRIGGER SDL_CONTROLLER_AXIS_TRIGGERLEFT
-#define SDL_GAMEPAD_AXIS_RIGHT_TRIGGER SDL_CONTROLLER_AXIS_TRIGGERRIGHT
-
-// SDL_OpenGamepad() not defined due to differing semantics
-SDL_JoystickID* SDL_GetGamepads(int *count);
-#define SDL_OpenGamepad(x) SDL_GameControllerOpen(x)
-#define SDL_CloseGamepad(x) SDL_GameControllerClose(x)
-#define SDL_GetGamepadMapping(x) SDL_GameControllerMapping(x)
-#define SDL_GetGamepadName(x) SDL_GameControllerName(x)
-#define SDL_GetGamepadVendor(x) SDL_GameControllerGetVendor(x)
-#define SDL_GetGamepadProduct(x) SDL_GameControllerGetProduct(x)
-#define SDL_GetGamepadJoystick(x) SDL_GameControllerGetJoystick(x)
-#define SDL_GamepadHasButton(x, y) SDL_GameControllerHasButton(x, y)
-#define SDL_GamepadHasSensor(x, y) SDL_GameControllerHasSensor(x, y)
-#define SDL_SetGamepadPlayerIndex(x, y) SDL_GameControllerSetPlayerIndex(x, y)
-#define SDL_GamepadSensorEnabled(x, y) SDL_GameControllerIsSensorEnabled(x, y)
-#define SDL_SetGamepadSensorEnabled(x, y, z) SDL_GameControllerSetSensorEnabled(x, y, z)
-#define SDL_GetNumGamepadTouchpads(x) SDL_GameControllerGetNumTouchpads(x)
-#define SDL_SetGamepadLED(x, r, g, b) SDL_GameControllerSetLED(x, r, g, b)
-#define SDL_RumbleGamepad(x, y, z, w) SDL_GameControllerRumble(x, y, z, w)
-#define SDL_RumbleGamepadTriggers(x, y, z, w) SDL_GameControllerRumbleTriggers(x, y, z, w)
-#define SDL_GetGamepadAxis(x, y) SDL_GameControllerGetAxis(x, y)
-#define SDL_GetGamepadType(x) SDL_GameControllerGetType(x)
-#define SDL_IsGamepad(x) SDL_IsGameController(x)
-
-#define SDL_GAMEPAD_TYPE_STANDARD SDL_CONTROLLER_TYPE_UNKNOWN
-#define SDL_GAMEPAD_TYPE_VIRTUAL SDL_CONTROLLER_TYPE_VIRTUAL
-#define SDL_GAMEPAD_TYPE_XBOX360 SDL_CONTROLLER_TYPE_XBOX360
-#define SDL_GAMEPAD_TYPE_XBOXONE SDL_CONTROLLER_TYPE_XBOXONE
-#define SDL_GAMEPAD_TYPE_PS3 SDL_CONTROLLER_TYPE_PS3
-#define SDL_GAMEPAD_TYPE_PS4 SDL_CONTROLLER_TYPE_PS4
-#define SDL_GAMEPAD_TYPE_PS5 SDL_CONTROLLER_TYPE_PS5
-#define SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT
-#define SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_PAIR SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR
-#define SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT
-#define SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO
-
-// SDL_OpenGamepad() not defined due to differing semantics
-SDL_JoystickID* SDL_GetJoysticks(int *count);
-#define SDL_OpenJoystick(x) SDL_JoystickOpen(x)
-#define SDL_CloseJoystick(x) SDL_JoystickClose(x)
-#define SDL_GetJoystickID(x) SDL_JoystickInstanceID(x)
-#define SDL_GetJoystickGUID(x) SDL_JoystickGetGUID(x)
-#define SDL_GetJoystickPowerLevel(x) SDL_JoystickCurrentPowerLevel(x)
-#define SDL_GetNumJoystickAxes(x) SDL_JoystickNumAxes(x)
-#define SDL_GetNumJoystickBalls(x) SDL_JoystickNumBalls(x)
-#define SDL_GetNumJoystickButtons(x) SDL_JoystickNumButtons(x)
-#define SDL_GetNumJoystickHats(x) SDL_JoystickNumHats(x)
-#define SDL_GetJoystickGUIDForID(x) SDL_JoystickGetDeviceGUID(x)
-
-typedef SDL_ControllerAxisEvent SDL_GamepadAxisEvent;
-typedef SDL_ControllerButtonEvent SDL_GamepadButtonEvent;
-typedef SDL_ControllerSensorEvent SDL_GamepadSensorEvent;
-typedef SDL_ControllerTouchpadEvent SDL_GamepadTouchpadEvent;
-typedef SDL_ControllerDeviceEvent SDL_GamepadDeviceEvent;
-typedef SDL_GameController SDL_Gamepad;
-typedef SDL_GameControllerButton SDL_GamepadButton;
-
-// Audio
-#define SDL_AUDIO_F32 AUDIO_F32SYS
-
-#define SDL_ResumeAudioDevice(x) SDL_PauseAudioDevice(x, 0)
-
-// Atomics
-#define SDL_GetAtomicInt(x) SDL_AtomicGet(x)
-#define SDL_SetAtomicInt(x, y) SDL_AtomicSet(x, y)
-#define SDL_GetAtomicPointer(x) SDL_AtomicGetPtr(x)
-#define SDL_SetAtomicPointer(x, y) SDL_AtomicSetPtr(x, y)
-
-#define SDL_LockSpinlock(x) SDL_AtomicLock(x)
-#define SDL_TryLockSpinlock(x) SDL_AtomicTryLock(x)
-#define SDL_UnlockSpinlock(x) SDL_AtomicUnlock(x)
-
-typedef SDL_atomic_t SDL_AtomicInt;
-
-// Video
-#define SDL_KMOD_CTRL KMOD_CTRL
-#define SDL_KMOD_ALT KMOD_ALT
-#define SDL_KMOD_SHIFT KMOD_SHIFT
-#define SDL_KMOD_GUI KMOD_GUI
-
-#define SDL_WINDOW_HIGH_PIXEL_DENSITY SDL_WINDOW_ALLOW_HIGHDPI
-
-#define SDL_SetWindowFullscreenMode(x, y) SDL_SetWindowDisplayMode(x, y)
-#define SDL_GetDisplayForWindow(x) SDL_GetWindowDisplayIndex(x)
-#define SDL_GetRenderViewport(x, y) SDL_RenderGetViewport(x, y)
-#define SDL_DestroySurface(x) SDL_FreeSurface(x)
-#define SDL_RenderTexture(x, y, z, w) SDL_RenderCopy(x, y, z, w)
-#define SDL_GetPrimaryDisplay() (0)
-
-#define SDL_CreateSurfaceFrom(w, h, fmt, pixels, pitch) SDL_CreateRGBSurfaceWithFormatFrom(pixels, w, h, SDL_BITSPERPIXEL(fmt), pitch, fmt)
-
-#define SDLC_DEFAULT_RENDER_DRIVER -1
-
-typedef int SDL_DisplayID;
-SDL_DisplayID * SDL_GetDisplays(int *count);
-const SDL_DisplayMode * SDL_GetWindowFullscreenMode(SDL_Window *window);
-
-// Misc
-#define SDL_GetNumLogicalCPUCores() SDL_GetCPUCount()
-#define SDL_IOFromConstMem(x, y) SDL_RWFromConstMem(x, y)
-#define SDL_SetCurrentThreadPriority(x) SDL_SetThreadPriority(x)
-#define SDL_GUIDToString(x, y, z) SDL_JoystickGetGUIDString(x, y, z)
-
-#ifdef __cplusplus
-}
-#endif
@@ -1,5 +1,5 @@
 QT += core quick network quickcontrols2 svg
-CONFIG += c++11
+CONFIG += c++17

 unix:!macx {
    TARGET = moonlight
@@ -36,35 +36,29 @@ DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

 win32 {
-    contains(QT_ARCH, i386) {
-        LIBS += -L$$PWD/../libs/windows/lib/x86
-        INCLUDEPATH += $$PWD/../libs/windows/include/x86
+    !exists($$PWD/../libs/windows) {
+        error("Missing dependencies. Please run 'powershell .\setup-deps.ps1' to fetch prebuilt libraries.")
    }
+
    contains(QT_ARCH, x86_64) {
        LIBS += -L$$PWD/../libs/windows/lib/x64
-        INCLUDEPATH += $$PWD/../libs/windows/include/x64
+        INCLUDEPATH += $$PWD/../libs/windows/include/x64 $$PWD/../libs/windows/include/x64/SDL2
    }
    contains(QT_ARCH, arm64) {
        LIBS += -L$$PWD/../libs/windows/lib/arm64
-        INCLUDEPATH += $$PWD/../libs/windows/include/arm64
+        INCLUDEPATH += $$PWD/../libs/windows/include/arm64 $$PWD/../libs/windows/include/arm64/SDL2
    }

    INCLUDEPATH += $$PWD/../libs/windows/include
    LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
-
-    # Work around a conflict with math.h inclusion between SDL and Qt 6
-    DEFINES += _USE_MATH_DEFINES
 }
 macx:!disable-prebuilts {
-    INCLUDEPATH += $$PWD/../libs/mac/include
-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
-    LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
+    !exists($$PWD/../libs/mac) {
+        error("Missing dependencies. Please run 'python3 setup-deps.py' to fetch prebuilt libraries.")
+    }

-    # QMake doesn't handle framework-style includes correctly on its own
-    QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
-    QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks
-    QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
+    INCLUDEPATH += $$PWD/../libs/mac/include $$PWD/../libs/mac/include/SDL2
+    LIBS += -L$$PWD/../libs/mac/lib
 }

 unix:if(!macx|disable-prebuilts) {
@@ -122,7 +116,9 @@ unix:if(!macx|disable-prebuilts) {
                }
            }

-            !disable-cuda {
+            # Disabled by default due to reliability issues. See #1314.
+            # CUDA interop is superseded by VDPAU and Vulkan Video.
+            enable-cuda {
                packagesExist(ffnvcodec) {
                    PKGCONFIG += ffnvcodec
                    CONFIG += cuda
@@ -157,24 +153,19 @@ win32 {
    CONFIG += ffmpeg libplacebo
 }
 win32:!winrt {
-    CONFIG += soundio discord-rpc
+    CONFIG += discord-rpc
 }
 macx {
    !disable-prebuilts {
-        LIBS += -lssl.3 -lcrypto.3 -lavcodec.61 -lavutil.59 -lswscale.8 -lopus -framework SDL2 -framework SDL2_ttf
-        CONFIG += discord-rpc
+        LIBS += -lssl.3 -lcrypto.3 -lavcodec.63 -lavutil.61 -lswscale.10 -lopus.0 -lSDL2 -lSDL2_ttf -lplacebo
+        CONFIG += discord-rpc libplacebo
    }

    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal -framework QuartzCore
-
-    # For libsoundio
-    LIBS += -framework CoreAudio -framework AudioUnit
-
-    CONFIG += ffmpeg soundio
+    CONFIG += ffmpeg
 }

 SOURCES += \
-    SDL_compat.c \
    backend/nvaddress.cpp \
    backend/nvapp.cpp \
    cli/pair.cpp \
@@ -205,6 +196,7 @@ SOURCES += \
    streaming/audio/renderers/sdlaud.cpp \
    gui/computermodel.cpp \
    gui/appmodel.cpp \
+    streaming/bandwidth.cpp \
    streaming/streamutils.cpp \
    backend/autoupdatechecker.cpp \
    path.cpp \
@@ -242,6 +234,7 @@ HEADERS += \
    gui/computermodel.h \
    gui/appmodel.h \
    streaming/video/decoder.h \
+    streaming/bandwidth.h \
    streaming/streamutils.h \
    backend/autoupdatechecker.h \
    path.h \
@@ -330,9 +323,12 @@ libdrm {
    HEADERS += streaming/video/ffmpeg-renderers/drm.h

    linux {
-        message(Master hooks enabled)
-        SOURCES += masterhook.c masterhook_internal.c
-        LIBS += -ldl
+        !disable-masterhooks {
+            message(Master hooks enabled)
+            DEFINES += HAVE_DRM_MASTER_HOOKS
+            SOURCES += masterhook.c masterhook_internal.c
+            LIBS += -ldl -pthread
+        }
    }
 }
 cuda {
@@ -354,6 +350,10 @@ libplacebo {
        streaming/video/ffmpeg-renderers/plvk_c.c
    HEADERS += \
        streaming/video/ffmpeg-renderers/plvk.h
+
+    macx {
+        SOURCES += streaming/video/ffmpeg-renderers/plvk_objc.mm
+    }
 }
 config_EGL {
    message(EGL renderer selected)
@@ -415,13 +415,6 @@ macx {
    HEADERS += \
        streaming/video/ffmpeg-renderers/vt.h
 }
-soundio {
-    message(libsoundio audio renderer selected)
-
-    DEFINES += HAVE_SOUNDIO SOUNDIO_STATIC_LIBRARY
-    SOURCES += streaming/audio/renderers/soundioaudiorenderer.cpp
-    HEADERS += streaming/audio/renderers/soundioaudiorenderer.h
-}
 discord-rpc {
    message(Discord integration enabled)

@@ -487,7 +480,10 @@ TRANSLATIONS += \
    languages/qml_he.ts \
    languages/qml_ckb.ts \
    languages/qml_lt.ts \
-    languages/qml_et.ts
+    languages/qml_et.ts \
+    languages/qml_bg.ts \
+    languages/qml_eo.ts \
+    languages/qml_ta.ts

 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
@@ -509,21 +505,12 @@ else:unix: LIBS += -L$$OUT_PWD/../qmdnsengine/ -lqmdnsengine
 INCLUDEPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine
 DEPENDPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine

-soundio {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio
-    else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio
-
-    INCLUDEPATH += $$PWD/../soundio/libsoundio
-    DEPENDPATH += $$PWD/../soundio/libsoundio
-}
-
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/release/ -lh264bitstream
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/debug/ -lh264bitstream
 else:unix: LIBS += -L$$OUT_PWD/../h264bitstream/ -lh264bitstream

-INCLUDEPATH += $$PWD/../h264bitstream/h264bitstream
-DEPENDPATH += $$PWD/../h264bitstream/h264bitstream
+INCLUDEPATH += $$PWD/../h264bitstream
+DEPENDPATH += $$PWD/../h264bitstream

 !winrt {
    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/release/ -lAntiHooking
@@ -58,7 +58,7 @@ void AutoUpdateChecker::start()
 void AutoUpdateChecker::parseStringToVersionQuad(QString& string, QVector<int>& version)
 {
    QStringList list = string.split('.');
-    for (const QString& component : list) {
+    for (const QString& component : std::as_const(list)) {
        version.append(component.toInt());
    }
 }
@@ -139,7 +139,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
            return;
        }

-        for (QJsonValueRef updateEntry : array) {
+        for (const auto& updateEntry : std::as_const(array)) {
            if (updateEntry.isObject()) {
                QJsonObject updateObj = updateEntry.toObject();
                if (!updateObj.contains("platform") ||
@@ -9,8 +9,7 @@
 #include <QThread>
 #include <QThreadPool>
 #include <QCoreApplication>
-
-#include <random>
+#include <QRandomGenerator>

 #define SER_HOSTS "hosts"
 #define SER_HOSTS_BACKUP "hostsbackup"
@@ -30,9 +29,9 @@ public:
    }

 private:
-    bool tryPollComputer(NvAddress address, bool& changed)
+    bool tryPollComputer(QNetworkAccessManager* nam, NvAddress address, bool& changed)
    {
-        NvHTTP http(address, 0, m_Computer->serverCert);
+        NvHTTP http(address, 0, m_Computer->serverCert, !m_Computer->isNvidiaServerSoftware, nam);

        QString serverInfo;
        try {
@@ -53,9 +52,9 @@ private:
        return true;
    }

-    bool updateAppList(bool& changed)
+    bool updateAppList(QNetworkAccessManager* nam, bool& changed)
    {
-        NvHTTP http(m_Computer);
+        NvHTTP http(m_Computer, nam);

        QVector<NvApp> appList;

@@ -75,6 +74,21 @@ private:

    void run() override
    {
+        // Reduce the power and performance impact of our
+        // computer status polling while it's running.
+        setPriority(QThread::LowPriority);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+        setServiceLevel(QThread::QualityOfService::Eco);
+#endif
+
+        // Share the QNetworkAccessManager to conserve resources when polling.
+        // Each instance creates a worker thread, so sharing them ensures that
+        // we are not spamming a new thread for every single polling attempt.
+        //
+        // Since QThread inherit the priority of the current thread, this also
+        // ensures that the NAM's worker thread will inherit our lower priority.
+        QNetworkAccessManager nam;
+
        // Always fetch the applist the first time
        int pollsSinceLastAppListFetch = POLLS_PER_APPLIST_FETCH;
        while (!isInterruptionRequested()) {
@@ -87,7 +101,7 @@ private:
                        return;
                    }

-                    if (tryPollComputer(address, stateChanged)) {
+                    if (tryPollComputer(&nam, address, stateChanged)) {
                        if (!wasOnline) {
                            qInfo() << m_Computer->name << "is now online at" << m_Computer->activeAddress.toString();
                        }
@@ -118,7 +132,7 @@ private:
                    stateChanged = false;
                }

-                if (updateAppList(stateChanged)) {
+                if (updateAppList(&nam, stateChanged)) {
                    pollsSinceLastAppListFetch = 0;
                }
            }
@@ -217,17 +231,17 @@ ComputerManager::~ComputerManager()
    m_MdnsBrowser = nullptr;

    // Interrupt polling
-    for (ComputerPollingEntry* entry : m_PollEntries) {
+    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
        entry->interrupt();
    }

    // Delete all polling entries (and associated threads)
-    for (ComputerPollingEntry* entry : m_PollEntries) {
+    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
        delete entry;
    }

    // Destroy all NvComputer objects now that polling is halted
-    for (NvComputer* computer : m_KnownHosts) {
+    for (NvComputer* computer : std::as_const(m_KnownHosts)) {
        delete computer;
    }
 }
@@ -254,7 +268,7 @@ void DelayedFlushThread::run() {

            // Update the last serialized hosts map under the delayed flush mutex
            m_ComputerManager->m_LastSerializedHosts.clear();
-            for (const NvComputer* computer : m_ComputerManager->m_KnownHosts) {
+            for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
                // Copy the current state of the NvComputer to allow us to check later if we need
                // to serialize it again when attribute updates occur.
                QReadLocker computerLock(&computer->lock);
@@ -271,7 +285,7 @@ void DelayedFlushThread::run() {
            {
                QReadLocker lock(&m_ComputerManager->m_Lock);
                int i = 0;
-                for (const NvComputer* computer : m_ComputerManager->m_KnownHosts) {
+                for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
                    settings.setArrayIndex(i++);
                    computer->serialize(settings, false);
                }
@@ -284,7 +298,7 @@ void DelayedFlushThread::run() {
            {
                QReadLocker lock(&m_ComputerManager->m_Lock);
                int i = 0;
-                for (const NvComputer* computer : m_ComputerManager->m_KnownHosts) {
+                for (const NvComputer* computer : std::as_const(m_ComputerManager->m_KnownHosts)) {
                    settings.setArrayIndex(i++);
                    computer->serialize(settings, true);
                }
@@ -410,13 +424,15 @@ void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,
    bool added = false;

    // Add the host using the IPv4 address
-    for (const QHostAddress& address : addresses) {
+    for (const QHostAddress& address : std::as_const(addresses)) {
        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
            // NB: We don't just call addNewHost() here with v6Global because the IPv6
            // address may not be reachable (if the user hasn't installed the IPv6 helper yet
            // or if this host lacks outbound IPv6 capability). We want to add IPv6 even if
            // it's not currently reachable.
-            addNewHost(NvAddress(address, computer->port()), true, NvAddress(v6Global, computer->port()));
+            addNewHost(NvAddress(address, computer->port()),
+                       true, computer->hostname(),
+                       NvAddress(v6Global, computer->port()));
            added = true;
            break;
        }
@@ -424,13 +440,15 @@ void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,

    if (!added) {
        // If we get here, there wasn't an IPv4 address so we'll do it v6-only
-        for (const QHostAddress& address : addresses) {
+        for (const QHostAddress& address : std::as_const(addresses)) {
            if (address.protocol() == QAbstractSocket::IPv6Protocol) {
                // Use a link-local or site-local address for the "local address"
                if (address.isInSubnet(QHostAddress("fe80::"), 10) ||
                        address.isInSubnet(QHostAddress("fec0::"), 10) ||
                        address.isInSubnet(QHostAddress("fc00::"), 7)) {
-                    addNewHost(NvAddress(address, computer->port()), true, NvAddress(v6Global, computer->port()));
+                    addNewHost(NvAddress(address, computer->port()),
+                               true, computer->hostname(),
+                               NvAddress(v6Global, computer->port()));
                    break;
                }
            }
@@ -551,7 +569,7 @@ void ComputerManager::handleAboutToQuit()

    // Interrupt polling threads immediately, so they
    // avoid making additional requests while quitting
-    for (ComputerPollingEntry* entry : m_PollEntries) {
+    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
        entry->interrupt();
    }
 }
@@ -703,7 +721,7 @@ void ComputerManager::stopPollingAsync()
    m_MdnsServer.reset();

    // Interrupt all threads, but don't wait for them to terminate
-    for (ComputerPollingEntry* entry : m_PollEntries) {
+    for (ComputerPollingEntry* entry : std::as_const(m_PollEntries)) {
        entry->interrupt();
    }
 }
@@ -715,6 +733,10 @@ void ComputerManager::addNewHostManually(QString address)
        // If there wasn't a port specified, use the default
        addNewHost(NvAddress(url.host(), url.port(DEFAULT_HTTP_PORT)), false);
    }
+    else if (QHostAddress(address).protocol() == QAbstractSocket::IPv6Protocol) {
+        // The user specified an IPv6 literal without URL escaping, so use the default port
+        addNewHost(NvAddress(address, DEFAULT_HTTP_PORT), false);
+    }
    else {
        emit computerAddCompleted(false, false);
    }
@@ -725,8 +747,9 @@ class PendingAddTask : public QObject, public QRunnable
    Q_OBJECT

 public:
-    PendingAddTask(ComputerManager* computerManager, NvAddress address, NvAddress mdnsIpv6Address, bool mdns)
+    PendingAddTask(ComputerManager* computerManager, QString name, NvAddress address, NvAddress mdnsIpv6Address, bool mdns)
        : m_ComputerManager(computerManager),
+          m_Name(name),
          m_Address(address),
          m_MdnsIpv6Address(mdnsIpv6Address),
          m_Mdns(mdns),
@@ -802,9 +825,21 @@ private:

    void run()
    {
-        NvHTTP http(m_Address, 0, QSslCertificate());
+        // Use the placeholder UID for the initial poll, then we'll switch to the real one if it's not GFE
+        NvHTTP http(m_Address, 0, QSslCertificate(), false);

-        qInfo() << "Processing new PC at" << m_Address.toString() << "from" << (m_Mdns ? "mDNS" : "user") << "with IPv6 address" << m_MdnsIpv6Address.toString();
+        if (m_Mdns) {
+            if (m_MdnsIpv6Address.isNull()) {
+                qInfo() << "Processing new PC" << m_Name << "from mDNS with local address" << m_Address.toString();
+            }
+            else {
+                qInfo() << "Processing new PC" << m_Name << "from mDNS with local address" << m_Address.toString()
+                        << "and IPv6 address" << m_MdnsIpv6Address.toString();
+            }
+        }
+        else {
+            qInfo() << "Processing new PC at" << m_Address.toString() << "from user";
+        }

        // Perform initial serverinfo fetch over HTTP since we don't know which cert to use
        QString serverInfo = fetchServerInfo(http);
@@ -819,6 +854,7 @@ private:

        // Create initial newComputer using HTTP serverinfo with no pinned cert
        NvComputer* newComputer = new NvComputer(http, serverInfo);
+        http.setTrueUid(!newComputer->isNvidiaServerSoftware);

        // Check if we have a record of this host UUID to pull the pinned cert
        NvComputer* existingComputer;
@@ -952,28 +988,24 @@ private:
    }

    ComputerManager* m_ComputerManager;
+    QString m_Name;
    NvAddress m_Address;
    NvAddress m_MdnsIpv6Address;
    bool m_Mdns;
    bool m_AboutToQuit;
 };

-void ComputerManager::addNewHost(NvAddress address, bool mdns, NvAddress mdnsIpv6Address)
+void ComputerManager::addNewHost(NvAddress address, bool mdns, QString name, NvAddress mdnsIpv6Address)
 {
    // Punt to a worker thread to avoid stalling the
    // UI while waiting for serverinfo query to complete
-    PendingAddTask* addTask = new PendingAddTask(this, address, mdnsIpv6Address, mdns);
+    PendingAddTask* addTask = new PendingAddTask(this, name, address, mdnsIpv6Address, mdns);
    QThreadPool::globalInstance()->start(addTask);
 }

-// TODO: Use QRandomGenerator when we drop Qt 5.9 support
 QString ComputerManager::generatePinString()
 {
-    std::uniform_int_distribution<int> dist(0, 9999);
-    std::random_device rd;
-    std::mt19937 engine(rd());
-
-    return QString::asprintf("%04u", dist(engine));
+    return QString::asprintf("%04u", QRandomGenerator::system()->bounded(10000));
 }

 #include "computermanager.moc"
@@ -90,7 +90,6 @@ private slots:

    void handleResolvedAddress(const QHostAddress& address)
    {
-        qInfo() << "Resolved" << hostname() << "to" << address;
        m_Addresses.push_back(address);
    }

@@ -151,7 +150,7 @@ public:
        // interrupt() should have taken care of this
        Q_ASSERT(m_ActiveThread == nullptr);

-        for (QThread* thread : m_InactiveList) {
+        for (QThread* thread : std::as_const(m_InactiveList)) {
            thread->wait();
            delete thread;
        }
@@ -228,7 +227,7 @@ public:

    Q_INVOKABLE void addNewHostManually(QString address);

-    void addNewHost(NvAddress address, bool mdns, NvAddress mdnsIpv6Address = NvAddress());
+    void addNewHost(NvAddress address, bool mdns, QString name = QString(), NvAddress mdnsIpv6Address = NvAddress());

    QString generatePinString();

@@ -7,10 +7,9 @@ ComputerSeeker::ComputerSeeker(ComputerManager *manager, QString computerName, Q
      m_TimeoutTimer(new QTimer(this))
 {
    // If we know this computer, send a WOL packet to wake it up in case it is asleep.
-    for (NvComputer * computer: m_ComputerManager->getComputers()) {
-        if (this->matchComputer(computer)) {
-            computer->wake();
-        }
+    NvComputer* matchingComputer = findMatchingComputer();
+    if (matchingComputer) {
+        matchingComputer->wake();
    }

    m_TimeoutTimer->setSingleShot(true);
@@ -23,11 +22,16 @@ ComputerSeeker::ComputerSeeker(ComputerManager *manager, QString computerName, Q
 void ComputerSeeker::start(int timeout)
 {
    m_TimeoutTimer->start(timeout);
-    // Seek desired computer by both connecting to it directly (this may fail
-    // if m_ComputerName is UUID, or the name that doesn't resolve to an IP
-    // address) and by polling it using mDNS, hopefully one of these methods
-    // would find the host
-    m_ComputerManager->addNewHostManually(m_ComputerName);
+
+    // If we don't know this computer by name, address, or UUID, try adding it
+    // manually and see if we can find it by address, hostname, or mDNS.
+    //
+    // NB: We don't do this unconditionally because it will wipe out the user's
+    // manual address if they pass another reachable hostname/address.
+    if (!findMatchingComputer()) {
+        m_ComputerManager->addNewHostManually(m_ComputerName);
+    }
+
    m_ComputerManager->startPolling();
 }

@@ -51,7 +55,8 @@ bool ComputerSeeker::matchComputer(NvComputer *computer) const
        return true;
    }

-    for (const NvAddress& addr : computer->uniqueAddresses()) {
+    const auto uniqueAddresses = computer->uniqueAddresses();
+    for (const NvAddress& addr : uniqueAddresses) {
        if (addr.address().toLower() == value || addr.toString().toLower() == value) {
            return true;
        }
@@ -60,6 +65,18 @@ bool ComputerSeeker::matchComputer(NvComputer *computer) const
    return false;
 }

+NvComputer* ComputerSeeker::findMatchingComputer() const
+{
+    const auto computers = m_ComputerManager->getComputers();
+    for (NvComputer* computer : computers) {
+        if (this->matchComputer(computer)) {
+            return computer;
+        }
+    }
+
+    return nullptr;
+}
+
 bool ComputerSeeker::isOnline(NvComputer *computer) const
 {
    return computer->state == NvComputer::CS_ONLINE;
@@ -24,6 +24,7 @@ private slots:

 private:
    bool matchComputer(NvComputer *computer) const;
+    NvComputer* findMatchingComputer() const;
    bool isOnline(NvComputer *computer) const;

 private:
@@ -31,6 +31,10 @@ void IdentityManager::createCredentials(QSettings& settings)
    X509* cert = X509_new();
    THROW_BAD_ALLOC_IF_NULL(cert);

+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    EVP_PKEY* pk = EVP_RSA_gen(2048);
+    THROW_BAD_ALLOC_IF_NULL(pk);
+#else
    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
    THROW_BAD_ALLOC_IF_NULL(ctx);

@@ -43,6 +47,7 @@ void IdentityManager::createCredentials(QSettings& settings)

    EVP_PKEY_CTX_free(ctx);
    THROW_BAD_ALLOC_IF_NULL(pk);
+#endif

    X509_set_version(cert, 2);
    ASN1_INTEGER_set(X509_get_serialNumber(cert), 0);
@@ -50,28 +55,20 @@ void IdentityManager::createCredentials(QSettings& settings)
    X509_gmtime_adj(X509_get_notBefore(cert), 0);
    X509_gmtime_adj(X509_get_notAfter(cert), 60 * 60 * 24 * 365 * 20); // 20 yrs
 #else
-    ASN1_TIME* before = ASN1_STRING_dup(X509_get0_notBefore(cert));
-    THROW_BAD_ALLOC_IF_NULL(before);
-    ASN1_TIME* after = ASN1_STRING_dup(X509_get0_notAfter(cert));
-    THROW_BAD_ALLOC_IF_NULL(after);
-
-    X509_gmtime_adj(before, 0);
-    X509_gmtime_adj(after, 60 * 60 * 24 * 365 * 20); // 20 yrs
-
-    X509_set1_notBefore(cert, before);
-    X509_set1_notAfter(cert, after);
-
-    ASN1_STRING_free(before);
-    ASN1_STRING_free(after);
+    X509_gmtime_adj(X509_getm_notBefore(cert), 0);
+    X509_gmtime_adj(X509_getm_notAfter(cert), 60 * 60 * 24 * 365 * 20); // 20 yrs
 #endif

    X509_set_pubkey(cert, pk);

-    X509_NAME* name = X509_get_subject_name(cert);
+    X509_NAME* name = X509_NAME_new();
+    THROW_BAD_ALLOC_IF_NULL(name);
    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
                               reinterpret_cast<unsigned char *>(const_cast<char*>("NVIDIA GameStream Client")),
                               -1, -1, 0);
+    X509_set_subject_name(cert, name);
    X509_set_issuer_name(cert, name);
+    X509_NAME_free(name);

    X509_sign(cert, pk, EVP_sha256());

@@ -136,6 +133,22 @@ IdentityManager::IdentityManager()
    if (getSslKey().isNull()) {
        qFatal("Private key is unreadable");
    }
+
+    // Load the unique ID from settings
+    m_CachedUniqueId = settings.value(SER_UNIQUEID).toString();
+    if (!m_CachedUniqueId.isEmpty()) {
+        qInfo() << "Loaded unique ID from settings:" << m_CachedUniqueId;
+    }
+    else {
+        // Generate a new unique ID in base 16
+        uint64_t uid;
+        RAND_bytes(reinterpret_cast<unsigned char*>(&uid), sizeof(uid));
+        m_CachedUniqueId = QString::number(uid, 16);
+
+        qInfo() << "Generated new unique ID:" << m_CachedUniqueId;
+
+        settings.setValue(SER_UNIQUEID, m_CachedUniqueId);
+    }
 }

 QSslCertificate
@@ -173,7 +186,7 @@ IdentityManager::getSslKey()

        BUF_MEM* mem;
        BIO_get_mem_ptr(bio, &mem);
-        m_CachedSslKey = QSslKey(QByteArray::fromRawData(mem->data, (int)mem->length), QSsl::Rsa);
+        m_CachedSslKey = QSslKey(QByteArray(mem->data, (int)mem->length), QSsl::Rsa);

        BIO_free(bio);
        EVP_PKEY_free(pk);
@@ -193,25 +206,6 @@ IdentityManager::getSslConfig()
 QString
 IdentityManager::getUniqueId()
 {
-    if (m_CachedUniqueId.isEmpty()) {
-        QSettings settings;
-
-        // Load the unique ID from settings
-        m_CachedUniqueId = settings.value(SER_UNIQUEID).toString();
-        if (!m_CachedUniqueId.isEmpty()) {
-            qInfo() << "Loaded unique ID from settings:" << m_CachedUniqueId;
-        }
-        else {
-            // Generate a new unique ID in base 16
-            uint64_t uid;
-            RAND_bytes(reinterpret_cast<unsigned char*>(&uid), sizeof(uid));
-            m_CachedUniqueId = QString::number(uid, 16);
-
-            qInfo() << "Generated new unique ID:" << m_CachedUniqueId;
-
-            settings.setValue(SER_UNIQUEID, m_CachedUniqueId);
-        }
-    }
    return m_CachedUniqueId;
 }

@@ -25,7 +25,9 @@ public:

    bool isInitialized()
    {
-        return id != 0 && !name.isEmpty();
+        // We use isNull() instead of isEmpty() here because we want
+        // to detect cases where the name is unassigned, not empty.
+        return id != 0 && !name.isNull();
    }

    void
@@ -99,7 +99,7 @@ void NvComputer::serialize(QSettings& settings, bool serializeApps) const
        settings.beginWriteArray(SER_APPLIST);
        for (int i = 0; i < appList.count(); i++) {
            settings.setArrayIndex(i);
-            appList[i].serialize(settings);
+            appList.at(i).serialize(settings);
        }
        settings.endArray();
    }
@@ -141,7 +141,7 @@ NvComputer::NvComputer(NvHTTP& http, QString serverInfo)
    QString newMacString = NvHTTP::getXmlString(serverInfo, "mac");
    if (newMacString != "00:00:00:00:00:00") {
        QStringList macOctets = newMacString.split(':');
-        for (const QString& macOctet : macOctets) {
+        for (const QString& macOctet : std::as_const(macOctets)) {
            this->macAddress.append((char) macOctet.toInt(nullptr, 16));
        }
    }
@@ -254,14 +254,16 @@ bool NvComputer::wake() const
    // case the host has timed out in ARP entries.
    QMap<QString, quint16> addressMap;
    QSet<quint16> basePortSet;
-    for (const NvAddress& addr : uniqueAddresses()) {
+    const auto uniqueHostAddresses = uniqueAddresses();
+    for (const NvAddress& addr : uniqueHostAddresses) {
        addressMap.insert(addr.address(), addr.port());
        basePortSet.insert(addr.port());
    }
    addressMap.insert("255.255.255.255", 0);

    // Try to broadcast on all available NICs
-    for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
+    const auto allInterfaces = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface& nic : allInterfaces) {
        // Ensure the interface is up and skip the loopback adapter
        if ((nic.flags() & QNetworkInterface::IsUp) == 0 ||
                (nic.flags() & QNetworkInterface::IsLoopBack) != 0) {
@@ -269,7 +271,8 @@ bool NvComputer::wake() const
        }

        QHostAddress allNodesMulticast("FF02::1");
-        for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
+        const auto allInterfaceAddresses = nic.addressEntries();
+        for (const QNetworkAddressEntry& addr : allInterfaceAddresses) {
            // Store the scope ID for this NIC if IPv6 is enabled
            if (!addr.ip().scopeId().isEmpty()) {
                allNodesMulticast.setScopeId(addr.ip().scopeId());
@@ -375,13 +378,15 @@ NvComputer::ReachabilityType NvComputer::getActiveAddressReachability() const
        Q_ASSERT(!s.localAddress().isNull());
        Q_ASSERT(!s.peerAddress().isNull());

-        for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
+        const auto allInterfaces = QNetworkInterface::allInterfaces();
+        for (const QNetworkInterface& nic : allInterfaces) {
            // Ensure the interface is up
            if ((nic.flags() & QNetworkInterface::IsUp) == 0) {
                continue;
            }

-            for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
+            const auto allInterfaceAddresses = nic.addressEntries();
+            for (const QNetworkAddressEntry& addr : allInterfaceAddresses) {
                if (addr.ip() == s.localAddress()) {
                    qInfo() << "Found matching interface:" << nic.humanReadableName() << nic.hardwareAddress() << nic.flags();

@@ -463,7 +468,7 @@ bool NvComputer::updateAppList(QVector<NvApp> newAppList) {
    }

    // Propagate client-side attributes to the new app list
-    for (const NvApp& existingApp : appList) {
+    for (const NvApp& existingApp : std::as_const(appList)) {
        for (NvApp& newApp : newAppList) {
            if (existingApp.id == newApp.id) {
                newApp.hidden = existingApp.hidden;
@@ -18,8 +18,16 @@
 #define RESUME_TIMEOUT_MS 30000
 #define QUIT_TIMEOUT_MS 30000

-NvHTTP::NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert) :
-    m_ServerCert(serverCert)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#define XML_NAME_EQUALS(x, y) ((x) == (y))
+#else
+#define XML_NAME_EQUALS(x, y) ((x) == (u##y))
+#endif
+
+NvHTTP::NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert, bool useTrueUid, QNetworkAccessManager* nam) :
+    m_Nam(nam ? nam : new QNetworkAccessManager(this)),
+    m_ServerCert(serverCert),
+    m_UseTrueUid(useTrueUid)
 {
    m_BaseUrlHttp.setScheme("http");
    m_BaseUrlHttps.setScheme("https");
@@ -29,15 +37,12 @@ NvHTTP::NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert

    // Never use a proxy server
    QNetworkProxy noProxy(QNetworkProxy::NoProxy);
-    m_Nam.setProxy(noProxy);
-
-    connect(&m_Nam, &QNetworkAccessManager::sslErrors, this, &NvHTTP::handleSslErrors);
+    m_Nam->setProxy(noProxy);
 }

-NvHTTP::NvHTTP(NvComputer* computer) :
-    NvHTTP(computer->activeAddress, computer->activeHttpsPort, computer->serverCert)
+NvHTTP::NvHTTP(NvComputer* computer, QNetworkAccessManager* nam) :
+    NvHTTP(computer->activeAddress, computer->activeHttpsPort, computer->serverCert, !computer->isNvidiaServerSoftware, nam)
 {
-
 }

 void NvHTTP::setServerCert(QSslCertificate serverCert)
@@ -62,6 +67,11 @@ void NvHTTP::setHttpsPort(uint16_t port)
    m_BaseUrlHttps.setPort(port);
 }

+void NvHTTP::setTrueUid(bool useTrueUid)
+{
+    m_UseTrueUid = useTrueUid;
+}
+
 NvAddress NvHTTP::address()
 {
    return m_Address;
@@ -110,7 +120,7 @@ NvHTTP::getCurrentGame(QString serverInfo)
    // has the semantics that its name would indicate. To contain the effects of this change as much
    // as possible, we'll force the current game to zero if the server isn't in a streaming session.
    QString serverState = getXmlString(serverInfo, "state");
-    if (serverState != nullptr && serverState.endsWith("_SERVER_BUSY"))
+    if (serverState.endsWith("_SERVER_BUSY"))
    {
        return getXmlString(serverInfo, "currentgame").toInt();
    }
@@ -267,17 +277,19 @@ NvHTTP::getDisplayModeList(QString serverInfo)
    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
            auto name = xmlReader.name();
-            if (name == QString("DisplayMode")) {
+            if (XML_NAME_EQUALS(name, "DisplayMode")) {
                modes.append(NvDisplayMode());
            }
-            else if (name == QString("Width")) {
-                modes.last().width = xmlReader.readElementText().toInt();
-            }
-            else if (name == QString("Height")) {
-                modes.last().height = xmlReader.readElementText().toInt();
-            }
-            else if (name == QString("RefreshRate")) {
-                modes.last().refreshRate = xmlReader.readElementText().toInt();
+            else if (!modes.isEmpty()) {
+                if (XML_NAME_EQUALS(name, "Width")) {
+                    modes.last().width = xmlReader.readElementText().toInt();
+                }
+                else if (XML_NAME_EQUALS(name, "Height")) {
+                    modes.last().height = xmlReader.readElementText().toInt();
+                }
+                else if (XML_NAME_EQUALS(name, "RefreshRate")) {
+                    modes.last().refreshRate = xmlReader.readElementText().toInt();
+                }
            }
        }
    }
@@ -300,26 +312,36 @@ NvHTTP::getAppList()
    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
            auto name = xmlReader.name();
-            if (name == QString("App")) {
+            if (XML_NAME_EQUALS(name, "App")) {
                // We must have a valid app before advancing to the next one
                if (!apps.isEmpty() && !apps.last().isInitialized()) {
                    qWarning() << "Invalid applist XML";
-                    Q_ASSERT(false);
-                    return QVector<NvApp>();
+                    throw std::runtime_error("Invalid applist XML");
                }
                apps.append(NvApp());
            }
-            else if (name == QString("AppTitle")) {
-                apps.last().name = xmlReader.readElementText();
-            }
-            else if (name == QString("ID")) {
-                apps.last().id = xmlReader.readElementText().toInt();
-            }
-            else if (name == QString("IsHdrSupported")) {
-                apps.last().hdrSupported = xmlReader.readElementText() == "1";
-            }
-            else if (name == QString("IsAppCollectorGame")) {
-                apps.last().isAppCollectorGame = xmlReader.readElementText() == "1";
+            else if (!apps.isEmpty()) {
+                if (XML_NAME_EQUALS(name, "AppTitle")) {
+                    // If an app has no name, Sunshine may send us <AppTitle/>,
+                    // which readElementText() returns as a null QString.
+                    // We want to treat this as an empty QString instead, so we
+                    // will explicitly convert it. An empty string will satisfy
+                    // NvApp's isInitialized() check.
+                    QString name = xmlReader.readElementText();
+                    if (name.isNull()) {
+                        name = "";
+                    }
+                    apps.last().name = name;
+                }
+                else if (XML_NAME_EQUALS(name, "ID")) {
+                    apps.last().id = xmlReader.readElementText().toInt();
+                }
+                else if (XML_NAME_EQUALS(name, "IsHdrSupported")) {
+                    apps.last().hdrSupported = xmlReader.readElementText() == "1";
+                }
+                else if (XML_NAME_EQUALS(name, "IsAppCollectorGame")) {
+                    apps.last().isAppCollectorGame = xmlReader.readElementText() == "1";
+                }
            }
        }
    }
@@ -334,7 +356,7 @@ NvHTTP::verifyResponseStatus(QString xml)

    while (xmlReader.readNextStartElement())
    {
-        if (xmlReader.name() == QString("root"))
+        if (XML_NAME_EQUALS(xmlReader.name(), "root"))
        {
            // Status code can be 0xFFFFFFFF in some rare cases on GFE 3.20.3, and
            // QString::toInt() will fail in that case, so use QString::toUInt()
@@ -385,13 +407,7 @@ QByteArray
 NvHTTP::getXmlStringFromHex(QString xml,
                            QString tagName)
 {
-    QString str = getXmlString(xml, tagName);
-    if (str == nullptr)
-    {
-        return nullptr;
-    }
-
-    return QByteArray::fromHex(str.toLatin1());
+    return QByteArray::fromHex(getXmlString(xml, tagName).toUtf8());
 }

 QString
@@ -413,7 +429,7 @@ NvHTTP::getXmlString(QString xml,
        }
    }

-    return nullptr;
+    return QString();
 }

 void NvHTTP::handleSslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
@@ -476,11 +492,9 @@ NvHTTP::openConnection(QUrl baseUrl,
    QUrl url(baseUrl);
    url.setPath("/" + command);

-    // Use a common UID for Moonlight clients to allow them to quit
-    // games for each other (otherwise GFE gets screwed up and it requires
-    // manual intervention to solve).
-    url.setQuery("uniqueid=0123456789ABCDEF&uuid=" +
-                 QUuid::createUuid().toRfc4122().toHex() +
+    // Use a placeholder UID for GFE allow them to quit games for each other.
+    url.setQuery("uniqueid=" + (m_UseTrueUid ? IdentityManager::get()->getUniqueId() : "0123456789ABCDEF") +
+                 "&uuid=" + QUuid::createUuid().toRfc4122().toHex() +
                 ((arguments != nullptr) ? ("&" + arguments) : ""));

    QNetworkRequest request(url);
@@ -493,15 +507,15 @@ NvHTTP::openConnection(QUrl baseUrl,
    request.setAttribute(QNetworkRequest::Http2AllowedAttribute, false);
 #endif

-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT)
-    // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1)
-    QT_WARNING_PUSH
-    QT_WARNING_DISABLE_DEPRECATED
-    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
-    QT_WARNING_POP
+#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
+    // Use fine-grained idle timeouts to avoid calling QNetworkAccessManager::clearAccessCache(),
+    // which tears down the NAM's global thread each time. We must not keep persistent connections
+    // or GFE will puke.
+    request.setAttribute(QNetworkRequest::ConnectionCacheExpiryTimeoutSecondsAttribute, 0);
 #endif

-    QNetworkReply* reply = m_Nam.get(request);
+    auto sslErrorsConnection = connect(m_Nam, &QNetworkAccessManager::sslErrors, this, &NvHTTP::handleSslErrors);
+    QNetworkReply* reply = m_Nam->get(request);

    // Run the request with a timeout if requested
    QEventLoop loop;
@@ -524,9 +538,11 @@ NvHTTP::openConnection(QUrl baseUrl,
        reply->abort();
    }

-    // We must clear out cached authentication and connections or
-    // GFE will puke next time
-    m_Nam.clearAccessCache();
+#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
+    // If we couldn't use fine-grained connection idle timeouts, kill them all now
+    m_Nam->clearAccessCache();
+#endif
+    disconnect(sslErrorsConnection);

    // Handle error
    if (reply->error() != QNetworkReply::NoError)
@@ -33,19 +33,19 @@ class GfeHttpResponseException : public std::exception
 public:
    GfeHttpResponseException(int statusCode, QString message) :
        m_StatusCode(statusCode),
-        m_StatusMessage(message)
+        m_StatusMessage(message.toUtf8())
    {

    }

    const char* what() const throw()
    {
-        return m_StatusMessage.toLatin1();
+        return m_StatusMessage.constData();
    }

    const char* getStatusMessage() const
    {
-        return m_StatusMessage.toLatin1();
+        return m_StatusMessage.constData();
    }

    int getStatusCode() const
@@ -55,12 +55,12 @@ public:

    QString toQString() const
    {
-        return m_StatusMessage + " (Error " + QString::number(m_StatusCode) + ")";
+        return QString::fromUtf8(m_StatusMessage) + " (Error " + QString::number(m_StatusCode) + ")";
    }

 private:
    int m_StatusCode;
-    QString m_StatusMessage;
+    QByteArray m_StatusMessage;
 };

 class QtNetworkReplyException : public std::exception
@@ -68,19 +68,19 @@ class QtNetworkReplyException : public std::exception
 public:
    QtNetworkReplyException(QNetworkReply::NetworkError error, QString errorText) :
        m_Error(error),
-        m_ErrorText(errorText)
+        m_ErrorText(errorText.toUtf8())
    {

    }

    const char* what() const throw()
    {
-        return m_ErrorText.toLatin1();
+        return m_ErrorText.constData();
    }

    const char* getErrorText() const
    {
-        return m_ErrorText.toLatin1();
+        return m_ErrorText.constData();
    }

    QNetworkReply::NetworkError getError() const
@@ -90,12 +90,12 @@ public:

    QString toQString() const
    {
-        return m_ErrorText + " (Error " + QString::number(m_Error) + ")";
+        return QString::fromUtf8(m_ErrorText) + " (Error " + QString::number(m_Error) + ")";
    }

 private:
    QNetworkReply::NetworkError m_Error;
-    QString m_ErrorText;
+    QByteArray m_ErrorText;
 };

 class NvHTTP : public QObject
@@ -109,9 +109,9 @@ public:
        NVLL_VERBOSE
    };

-    explicit NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert);
+    explicit NvHTTP(NvAddress address, uint16_t httpsPort, QSslCertificate serverCert, bool useTrueUid, QNetworkAccessManager* nam = nullptr);

-    explicit NvHTTP(NvComputer* computer);
+    explicit NvHTTP(NvComputer* computer, QNetworkAccessManager* nam = nullptr);

    static
    int
@@ -142,9 +142,9 @@ public:
                           NvLogLevel logLevel = NvLogLevel::NVLL_VERBOSE);

    void setServerCert(QSslCertificate serverCert);
-
    void setAddress(NvAddress address);
    void setHttpsPort(uint16_t port);
+    void setTrueUid(bool useTrueUid);

    NvAddress address();

@@ -196,6 +196,7 @@ private:
                   NvLogLevel logLevel);

    NvAddress m_Address;
-    QNetworkAccessManager m_Nam;
+    QNetworkAccessManager* m_Nam;
    QSslCertificate m_ServerCert;
+    bool m_UseTrueUid;
 };
@@ -54,16 +54,18 @@ NvPairingManager::generateRandomBytes(int length)
 QByteArray
 NvPairingManager::encrypt(const QByteArray& plaintext, const QByteArray& key)
 {
-    QByteArray ciphertext(plaintext.size(), 0);
-    EVP_CIPHER_CTX* cipher;
-    int ciphertextLen;
+    if (plaintext.isEmpty()) {
+        return QByteArray();
+    }

-    cipher = EVP_CIPHER_CTX_new();
+    EVP_CIPHER_CTX* cipher = EVP_CIPHER_CTX_new();
    THROW_BAD_ALLOC_IF_NULL(cipher);

    EVP_EncryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
    EVP_CIPHER_CTX_set_padding(cipher, 0);

+    QByteArray ciphertext(plaintext.size(), 0);
+    int ciphertextLen;
    EVP_EncryptUpdate(cipher,
                      reinterpret_cast<unsigned char*>(ciphertext.data()),
                      &ciphertextLen,
@@ -79,16 +81,18 @@ NvPairingManager::encrypt(const QByteArray& plaintext, const QByteArray& key)
 QByteArray
 NvPairingManager::decrypt(const QByteArray& ciphertext, const QByteArray& key)
 {
-    QByteArray plaintext(ciphertext.size(), 0);
-    EVP_CIPHER_CTX* cipher;
-    int plaintextLen;
+    if (ciphertext.isEmpty()) {
+        return QByteArray();
+    }

-    cipher = EVP_CIPHER_CTX_new();
+    EVP_CIPHER_CTX* cipher = EVP_CIPHER_CTX_new();
    THROW_BAD_ALLOC_IF_NULL(cipher);

    EVP_DecryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
    EVP_CIPHER_CTX_set_padding(cipher, 0);

+    QByteArray plaintext(ciphertext.size(), 0);
+    int plaintextLen;
    EVP_DecryptUpdate(cipher,
                      reinterpret_cast<unsigned char*>(plaintext.data()),
                      &plaintextLen,
@@ -101,6 +105,29 @@ NvPairingManager::decrypt(const QByteArray& ciphertext, const QByteArray& key)
    return plaintext;
 }

+QByteArray
+NvPairingManager::getSignatureFromCert(X509* cert)
+{
+#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
+    ASN1_BIT_STRING *asnSignature = cert->signature;
+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, cert);
+#else
+    const ASN1_BIT_STRING *asnSignature;
+    X509_get0_signature(&asnSignature, NULL, cert);
+#endif
+
+    return QByteArray(
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+        reinterpret_cast<const char*>(ASN1_STRING_data(asnSignature)),
+#else
+        reinterpret_cast<const char*>(ASN1_STRING_get0_data(asnSignature)),
+#endif
+        ASN1_STRING_length(asnSignature)
+    );
+}
+
 QByteArray
 NvPairingManager::getSignatureFromPemCert(const QByteArray& certificate)
 {
@@ -114,18 +141,7 @@ NvPairingManager::getSignatureFromPemCert(const QByteArray& certificate)
    X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
    BIO_free_all(bio);

-#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
-    ASN1_BIT_STRING *asnSignature = cert->signature;
-#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    ASN1_BIT_STRING *asnSignature;
-    X509_get0_signature(&asnSignature, NULL, cert);
-#else
-    const ASN1_BIT_STRING *asnSignature;
-    X509_get0_signature(&asnSignature, NULL, cert);
-#endif
-
-    QByteArray signature(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
-
+    QByteArray signature = getSignatureFromCert(cert);
    X509_free(cert);

    return signature;
@@ -184,7 +200,7 @@ NvPairingManager::signMessage(const QByteArray& message)
 QByteArray
 NvPairingManager::saltPin(const QByteArray& salt, QString pin)
 {
-    return QByteArray().append(salt).append(pin.toLatin1());
+    return QByteArray().append(salt).append(pin.toUtf8());
 }

 NvPairingManager::PairState
@@ -227,8 +243,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    }

    QByteArray serverCertStr = NvHTTP::getXmlStringFromHex(getCert, "plaincert");
-    if (serverCertStr == nullptr)
-    {
+    if (serverCertStr.isEmpty()) {
        qCritical() << "Server likely already pairing";
        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
        return PairState::ALREADY_IN_PROGRESS;
@@ -263,22 +278,18 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    }

    QByteArray challengeResponseData = decrypt(m_Http.getXmlStringFromHex(challengeXml, "challengeresponse"), aesKey);
+    if (challengeResponseData.size() < hashLength) {
+        qCritical() << "Invalid challengeresponse at stage #2";
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
+        return PairState::FAILED;
+    }
+
    QByteArray clientSecretData = generateRandomBytes(16);
    QByteArray challengeResponse;
    QByteArray serverResponse(challengeResponseData.data(), hashLength);

-#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
-    ASN1_BIT_STRING *asnSignature = m_Cert->signature;
-#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    ASN1_BIT_STRING *asnSignature;
-    X509_get0_signature(&asnSignature, NULL, m_Cert);
-#else
-    const ASN1_BIT_STRING *asnSignature;
-    X509_get0_signature(&asnSignature, NULL, m_Cert);
-#endif
-
    challengeResponse.append(challengeResponseData.data() + hashLength, 16);
-    challengeResponse.append(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
+    challengeResponse.append(getSignatureFromCert(m_Cert));
    challengeResponse.append(clientSecretData);

    QByteArray paddedHash = QCryptographicHash::hash(challengeResponse, hashAlgo);
@@ -298,6 +309,12 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    }

    QByteArray pairingSecret = NvHTTP::getXmlStringFromHex(respXml, "pairingsecret");
+    if (pairingSecret.size() <= 16) {
+        qCritical() << "Invalid pairingsecret at stage #3";
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
+        return PairState::FAILED;
+    }
+
    QByteArray serverSecret = pairingSecret.left(16);
    QByteArray serverSignature = pairingSecret.mid(16);

@@ -37,6 +37,9 @@ private:
    QByteArray
    decrypt(const QByteArray& ciphertext, const QByteArray& key);

+    QByteArray
+    getSignatureFromCert(X509* cert);
+
    QByteArray
    getSignatureFromPemCert(const QByteArray& certificate);

@@ -12,6 +12,38 @@
 #include <Windows.h>
 #endif

+class SystemPropertyQueryThread : public QThread
+{
+public:
+    SystemPropertyQueryThread(SystemProperties* properties)
+        : QThread(properties), m_Properties(properties)
+    {
+        setObjectName("System Properties Async Query Thread");
+    }
+
+private:
+    void run() override
+    {
+        bool hasHardwareAcceleration;
+        bool rendererAlwaysFullScreen;
+        bool supportsHdr;
+        QSize maximumResolution;
+
+        Session::getDecoderInfo(m_Properties->testWindow, hasHardwareAcceleration, rendererAlwaysFullScreen, supportsHdr, maximumResolution);
+
+        // Propagate the decoder properties to the SystemProperties singleton and emit any change signals on the main thread
+        QMetaObject::invokeMethod(m_Properties, "updateDecoderProperties",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(bool, hasHardwareAcceleration),
+                                  Q_ARG(bool, rendererAlwaysFullScreen),
+                                  Q_ARG(QSize, maximumResolution),
+                                  Q_ARG(bool, supportsHdr));
+    }
+
+private:
+    SystemProperties* m_Properties;
+};
+
 SystemProperties::SystemProperties()
 {
    versionString = QString(VERSION_STR);
@@ -19,15 +51,21 @@ SystemProperties::SystemProperties()
    isRunningWayland = WMUtils::isRunningWayland();
    isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb";
    usesMaterial3Theme = QLibraryInfo::version() >= QVersionNumber(6, 5, 0);
+
+#ifdef Q_OS_DARWIN
+    isDarwin = true;
+#else
+    isDarwin = false;
+#endif
+
    QString nativeArch = QSysInfo::currentCpuArchitecture();

 #ifdef Q_OS_WIN32
    {
        USHORT processArch, machineArch;

-        // Use IsWow64Process2 on TH2 and later, because it supports ARM64
-        auto fnIsWow64Process2 = (decltype(IsWow64Process2)*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process2");
-        if (fnIsWow64Process2 != nullptr && fnIsWow64Process2(GetCurrentProcess(), &processArch, &machineArch)) {
+        // Use IsWow64Process2() because it doesn't lie on ARM64
+        if (IsWow64Process2(GetCurrentProcess(), &processArch, &machineArch)) {
            switch (machineArch) {
            case IMAGE_FILE_MACHINE_I386:
                nativeArch = "i386";
@@ -66,15 +104,45 @@ SystemProperties::SystemProperties()
    hasDiscordIntegration = false;
 #endif

-    unmappedGamepads = SdlInputHandler::getUnmappedGamepads();
+    // These will be queried asynchronously to avoid blocking the UI
+    hasHardwareAcceleration = true;
+    rendererAlwaysFullScreen = false;
+    supportsHdr = true;
+    maximumResolution = QSize(0, 0);
+}

-    // Populate data that requires talking to SDL. We do it all in one shot
-    // and cache the results to speed up future queries on this data.
-    querySdlVideoInfo();
+SystemProperties::~SystemProperties()
+{
+    waitForAsyncLoad();
+}

-    Q_ASSERT(!monitorRefreshRates.isEmpty());
-    Q_ASSERT(!monitorNativeResolutions.isEmpty());
-    Q_ASSERT(!monitorSafeAreaResolutions.isEmpty());
+void SystemProperties::updateDecoderProperties(bool hasHardwareAcceleration, bool rendererAlwaysFullScreen, QSize maximumResolution, bool supportsHdr)
+{
+    SDL_assert(testWindow);
+
+    if (hasHardwareAcceleration != this->hasHardwareAcceleration) {
+        this->hasHardwareAcceleration = hasHardwareAcceleration;
+        emit hasHardwareAccelerationChanged();
+    }
+
+    if (rendererAlwaysFullScreen != this->rendererAlwaysFullScreen) {
+        this->rendererAlwaysFullScreen = rendererAlwaysFullScreen;
+        emit rendererAlwaysFullScreenChanged();
+    }
+
+    if (maximumResolution != this->maximumResolution) {
+        this->maximumResolution = maximumResolution;
+        emit maximumResolutionChanged();
+    }
+
+    if (supportsHdr != this->supportsHdr) {
+        this->supportsHdr = supportsHdr;
+        emit supportsHdrChanged();
+    }
+
+    SDL_DestroyWindow(testWindow);
+    testWindow = nullptr;
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }

 QRect SystemProperties::getNativeResolution(int displayIndex)
@@ -95,53 +163,32 @@ int SystemProperties::getRefreshRate(int displayIndex)
    return monitorRefreshRates.value(displayIndex);
 }

-class QuerySdlVideoThread : public QThread
+void SystemProperties::startAsyncLoad()
 {
-public:
-    QuerySdlVideoThread(SystemProperties* me) :
-        QThread(nullptr),
-        m_Me(me) {}
-
-    void run() override
-    {
-        m_Me->querySdlVideoInfoInternal();
+    if (systemPropertyQueryThread) {
+        // Already started/completed
+        return;
    }

-    SystemProperties* m_Me;
-};
-
-void SystemProperties::querySdlVideoInfo()
-{
-    if (WMUtils::isRunningX11() || WMUtils::isRunningWayland()) {
-        // Use a separate thread to temporarily initialize SDL
-        // video to avoid stomping on Qt's X11 and OGL state.
-        QuerySdlVideoThread thread(this);
-        thread.start();
-        thread.wait();
+    // This isn't actually asynchronous (due to the need to synchronize with
+    // SdlGamepadKeyNavigation), but we don't query it in the constructor
+    // because it's expensive.
+    unmappedGamepads = SdlInputHandler::getUnmappedGamepads();
+    if (!unmappedGamepads.isEmpty()) {
+        emit unmappedGamepadsChanged();
    }
-    else {
-        querySdlVideoInfoInternal();
-    }
-}

-void SystemProperties::querySdlVideoInfoInternal()
-{
-    hasHardwareAcceleration = false;
-
-    if (SDLC_FAILURE(SDL_InitSubSystem(SDL_INIT_VIDEO))) {
+    // We initialize the video subsystem and test window on the main thread
+    // because some platforms (macOS) do not support window creation on
+    // non-main threads.
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
                     SDL_GetError());
        return;
    }

-    // Update display related attributes (max FPS, native resolution, etc).
-    // We call the internal variant because we're already in a safe thread context.
-    refreshDisplaysInternal();
-
-    SDL_Window* testWindow = SDLC_CreateWindowWithFallback("", 0, 0, 1280, 720,
-                                                           SDL_WINDOW_HIDDEN,
-                                                           StreamUtils::getPlatformWindowFlags());
+    testWindow = StreamUtils::createTestWindow();
    if (!testWindow) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Failed to create window for hardware decode test: %s",
@@ -150,45 +197,27 @@ void SystemProperties::querySdlVideoInfoInternal()
        return;
    }

-    Session::getDecoderInfo(testWindow, hasHardwareAcceleration, rendererAlwaysFullScreen, supportsHdr, maximumResolution);
+    // Update display related attributes (max FPS, native resolution, etc).
+    //
+    // NB: SDL3 will forcefully refresh displays when a window is created,
+    // so we place this after the window creation to ensure we don't pay
+    // the penalty for mode enumeration twice.
+    refreshDisplays();

-    SDL_DestroyWindow(testWindow);
-
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    systemPropertyQueryThread = new SystemPropertyQueryThread(this);
+    systemPropertyQueryThread->start();
 }

-class RefreshDisplaysThread : public QThread
+void SystemProperties::waitForAsyncLoad()
 {
-public:
-    RefreshDisplaysThread(SystemProperties* me) :
-        QThread(nullptr),
-        m_Me(me) {}
-
-    void run() override
-    {
-        m_Me->refreshDisplaysInternal();
+    if (systemPropertyQueryThread) {
+        systemPropertyQueryThread->wait();
    }
-
-    SystemProperties* m_Me;
-};
+}

 void SystemProperties::refreshDisplays()
 {
-    if (WMUtils::isRunningX11() || WMUtils::isRunningWayland()) {
-        // Use a separate thread to temporarily initialize SDL
-        // video to avoid stomping on Qt's X11 and OGL state.
-        RefreshDisplaysThread thread(this);
-        thread.start();
-        thread.wait();
-    }
-    else {
-        refreshDisplaysInternal();
-    }
-}
-
-void SystemProperties::refreshDisplaysInternal()
-{
-    if (SDLC_FAILURE(SDL_InitSubSystem(SDL_INIT_VIDEO))) {
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
                     SDL_GetError());
@@ -196,19 +225,21 @@ void SystemProperties::refreshDisplaysInternal()
    }

    monitorNativeResolutions.clear();
-
-    int numDisplays = 0;
-    SDL_DisplayID *displays = SDL_GetDisplays(&numDisplays);
+    monitorSafeAreaResolutions.clear();
+    monitorRefreshRates.clear();

    SDL_DisplayMode bestMode;
-    for (int i = 0; i < numDisplays; i++) {
+    for (int displayIndex = 0; displayIndex < SDL_GetNumVideoDisplays(); displayIndex++) {
        SDL_DisplayMode desktopMode;
        SDL_Rect safeArea;

-        if (StreamUtils::getNativeDesktopMode(displays[i], &desktopMode, &safeArea)) {
+        if (StreamUtils::getNativeDesktopMode(displayIndex, &desktopMode, &safeArea)) {
            if (desktopMode.w <= 8192 && desktopMode.h <= 8192) {
-                monitorNativeResolutions.insert(i, QRect(0, 0, desktopMode.w, desktopMode.h));
-                monitorSafeAreaResolutions.insert(i, QRect(0, 0, safeArea.w, safeArea.h));
+                // Keep these lists compact because their QML consumers iterate until
+                // the first empty entry. Inserting by SDL display index is invalid if
+                // an earlier display was skipped (for example, a >8K virtual display).
+                monitorNativeResolutions.append(QRect(0, 0, desktopMode.w, desktopMode.h));
+                monitorSafeAreaResolutions.append(QRect(0, 0, safeArea.w, safeArea.h));
            }
            else {
                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
@@ -218,10 +249,10 @@ void SystemProperties::refreshDisplaysInternal()

            // Start at desktop mode and work our way up
            bestMode = desktopMode;
-            int numDisplayModes = SDL_GetNumDisplayModes(displays[i]);
+            int numDisplayModes = SDL_GetNumDisplayModes(displayIndex);
            for (int i = 0; i < numDisplayModes; i++) {
                SDL_DisplayMode mode;
-                if (SDL_GetDisplayMode(displays[i], i, &mode) == 0) {
+                if (SDL_GetDisplayMode(displayIndex, i, &mode) == 0) {
                    if (mode.w == desktopMode.w && mode.h == desktopMode.h) {
                        if (mode.refresh_rate > bestMode.refresh_rate) {
                            bestMode = mode;
@@ -244,6 +275,5 @@ void SystemProperties::refreshDisplaysInternal()
        }
    }

-    SDL_free(displays);
    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
@@ -3,46 +3,61 @@
 #include <QObject>
 #include <QRect>

+#include "SDL_compat.h"
+
 class SystemProperties : public QObject
 {
    Q_OBJECT

-    friend class QuerySdlVideoThread;
-    friend class RefreshDisplaysThread;
+    friend class SystemPropertyQueryThread;

 public:
    SystemProperties();
+    ~SystemProperties();

-    Q_PROPERTY(bool hasHardwareAcceleration MEMBER hasHardwareAcceleration CONSTANT)
-    Q_PROPERTY(bool rendererAlwaysFullScreen MEMBER rendererAlwaysFullScreen CONSTANT)
+    // Static properties queried synchronously during the constructor
    Q_PROPERTY(bool isRunningWayland MEMBER isRunningWayland CONSTANT)
    Q_PROPERTY(bool isRunningXWayland MEMBER isRunningXWayland CONSTANT)
    Q_PROPERTY(bool isWow64 MEMBER isWow64 CONSTANT)
+    Q_PROPERTY(bool isDarwin MEMBER isDarwin CONSTANT)
    Q_PROPERTY(QString friendlyNativeArchName MEMBER friendlyNativeArchName CONSTANT)
    Q_PROPERTY(bool hasDesktopEnvironment MEMBER hasDesktopEnvironment CONSTANT)
    Q_PROPERTY(bool hasBrowser MEMBER hasBrowser CONSTANT)
    Q_PROPERTY(bool hasDiscordIntegration MEMBER hasDiscordIntegration CONSTANT)
-    Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged)
-    Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution CONSTANT)
-    Q_PROPERTY(QString versionString MEMBER versionString CONSTANT)
-    Q_PROPERTY(bool supportsHdr MEMBER supportsHdr CONSTANT)
    Q_PROPERTY(bool usesMaterial3Theme MEMBER usesMaterial3Theme CONSTANT)
+    Q_PROPERTY(QString versionString MEMBER versionString CONSTANT)

-    Q_INVOKABLE void refreshDisplays();
+    // Properties queried asynchronously (startAsyncLoad() must be called!)
+    Q_PROPERTY(bool hasHardwareAcceleration MEMBER hasHardwareAcceleration NOTIFY hasHardwareAccelerationChanged)
+    Q_PROPERTY(bool rendererAlwaysFullScreen MEMBER rendererAlwaysFullScreen NOTIFY rendererAlwaysFullScreenChanged)
+    Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged)
+    Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution NOTIFY maximumResolutionChanged)
+    Q_PROPERTY(bool supportsHdr MEMBER supportsHdr NOTIFY supportsHdrChanged)
+
+    // Either startAsyncLoad()+waitForAsyncLoad() or refreshDisplays() must be invoked first
    Q_INVOKABLE QRect getNativeResolution(int displayIndex);
    Q_INVOKABLE QRect getSafeAreaResolution(int displayIndex);
    Q_INVOKABLE int getRefreshRate(int displayIndex);

+    Q_INVOKABLE void startAsyncLoad();
+    Q_INVOKABLE void waitForAsyncLoad();
+    Q_INVOKABLE void refreshDisplays();
+
 signals:
    void unmappedGamepadsChanged();
+    void hasHardwareAccelerationChanged();
+    void rendererAlwaysFullScreenChanged();
+    void maximumResolutionChanged();
+    void supportsHdrChanged();
+
+private slots:
+    void updateDecoderProperties(bool hasHardwareAcceleration, bool rendererAlwaysFullScreen, QSize maximumResolution, bool supportsHdr);

 private:
-    void querySdlVideoInfo();
-    void querySdlVideoInfoInternal();
-    void refreshDisplaysInternal();
+    QThread* systemPropertyQueryThread = nullptr;
+    SDL_Window* testWindow = nullptr;

-    bool hasHardwareAcceleration;
-    bool rendererAlwaysFullScreen;
+    // Properties set by the constructor
    bool isRunningWayland;
    bool isRunningXWayland;
    bool isWow64;
@@ -50,13 +65,20 @@ private:
    bool hasDesktopEnvironment;
    bool hasBrowser;
    bool hasDiscordIntegration;
-    QString unmappedGamepads;
+    QString versionString;
+    bool usesMaterial3Theme;
+    bool isDarwin;
+
+    // Properties only set if startAsyncLoad() is called
+    bool hasHardwareAcceleration;
+    bool rendererAlwaysFullScreen;
    QSize maximumResolution;
+    bool supportsHdr;
+    QString unmappedGamepads;
+
+    // Properties set by refreshDisplays()
    QList<QRect> monitorNativeResolutions;
    QList<QRect> monitorSafeAreaResolutions;
    QList<int> monitorRefreshRates;
-    QString versionString;
-    bool supportsHdr;
-    bool usesMaterial3Theme;
 };

@@ -59,13 +59,6 @@ public:

    void showMessage(QString message, MessageType type) const
    {
-    #if defined(Q_OS_WIN32)
-        UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
-        flags |= (type == Info ? MB_ICONINFORMATION : MB_ICONERROR);
-        QString title = "Moonlight";
-        MessageBoxW(nullptr, reinterpret_cast<const wchar_t *>(message.utf16()),
-                    reinterpret_cast<const wchar_t *>(title.utf16()), flags);
-    #endif
        message = message.endsWith('\n') ? message : message + '\n';
        fputs(qPrintable(message), type == Info ? stdout : stderr);
    }
@@ -113,7 +106,7 @@ public:

    QPair<int,int> getResolutionOptionValue(QString name) const
    {
-        QRegularExpression re("^(\\d+)x(\\d+)$", QRegularExpression::CaseInsensitiveOption);
+        static QRegularExpression re("^(\\d+)x(\\d+)$", QRegularExpression::CaseInsensitiveOption);
        auto match = re.match(value(name));
        if (!match.hasMatch()) {
            showError(QString("Invalid %1 format: %2").arg(name, value(name)));
@@ -202,7 +195,7 @@ GlobalCommandLineParser::ParseResult GlobalCommandLineParser::parse(const QStrin
            }
        }

-        parser.showError(QString("Invalid action"));
+        parser.showError("Invalid action");
    }
 }

@@ -386,7 +379,7 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    parser.handleUnknownOptions();

    // Resolve display's width and height
-    QRegularExpression resolutionRexExp("^(720|1080|1440|4K|resolution)$");
+    static QRegularExpression resolutionRexExp("^(720|1080|1440|4K|resolution)$");
    QStringList resoOptions = parser.optionNames().filter(resolutionRexExp);
    bool displaySet = !resoOptions.isEmpty();
    if (displaySet) {
@@ -5,10 +5,8 @@
 #include "backend/computerseeker.h"

 #include <QCoreApplication>
-#include <QTimer>

 #define COMPUTER_SEEK_TIMEOUT 30000
-#define APP_SEEK_TIMEOUT 10000

 namespace CliListApps
 {
@@ -16,8 +14,7 @@ namespace CliListApps
 enum State {
    StateInit,
    StateSeekComputer,
-    StateListApp,
-    StateSeekApp,
+    StateListApps,
    StateFailure,
 };

@@ -26,7 +23,6 @@ class Event
 public:
    enum Type {
        ComputerFound,
-        ComputerUpdated,
        ComputerSeekTimedout,
        Executed,
    };
@@ -66,9 +62,6 @@ public:
                           q, &Launcher::onComputerSeekTimeout);
                m_ComputerSeeker->start(COMPUTER_SEEK_TIMEOUT);

-                q->connect(m_ComputerManager, &ComputerManager::computerStateChanged,
-                           q, &Launcher::onComputerUpdated);
-
                m_BoxArtManager = new BoxArtManager(q);

                if (m_Arguments.isVerbose()) {
@@ -88,12 +81,28 @@ public:
        case Event::ComputerFound:
            if (m_State == StateSeekComputer) {
                if (event.computer->pairState == NvComputer::PS_PAIRED) {
-                    m_State = StateSeekApp;
+                    m_State = StateListApps;
                    m_Computer = event.computer;
-                    m_TimeoutTimer->start(APP_SEEK_TIMEOUT);
+
                    if (m_Arguments.isVerbose()) {
                        fprintf(stdout, "Loading app list...\n");
                    }
+
+                    // To avoid race conditions where ComputerSeeker stops async polling, but
+                    // ComputerManager is yet to update the app list, we will explicitly fetch the latest app list.
+                    // Otherwise, it becomes complicated as we would have to guess whether ComputerManager
+                    // would emit 1 signal (the list did not change) or 2 signals (indicating that the list has changed)
+                    try {
+                        NvHTTP http{m_Computer};
+
+                        const auto appList = http.getAppList();
+                        m_Arguments.isPrintCSV() ? printAppsCSV(appList) : printApps(appList);
+
+                        QCoreApplication::exit(0);
+                    } catch (std::exception& exception) {
+                        fprintf(stderr, "%s\n", exception.what());
+                        QCoreApplication::exit(1);
+                    }
                } else {
                    m_State = StateFailure;
                    fprintf(stderr, "%s\n", qPrintable(QObject::tr("Computer %1 has not been paired. "
@@ -104,14 +113,6 @@ public:
                }
            }
            break;
-        // Occurs when a computer is updated
-        case Event::ComputerUpdated:
-            if (m_State == StateSeekApp) {
-                m_Arguments.isPrintCSV() ? printAppsCSV(m_Computer->appList) : printApps(m_Computer->appList);
-
-                QCoreApplication::exit(0);
-            }
-            break;
        }
    }

@@ -146,7 +147,6 @@ public:
    BoxArtManager *m_BoxArtManager;
    NvComputer *m_Computer;
    State m_State;
-    QTimer *m_TimeoutTimer;
    ListCommandLineParser m_Arguments;
 };

@@ -157,11 +157,7 @@ Launcher::Launcher(QString computer, ListCommandLineParser arguments, QObject *p
    Q_D(Launcher);
    d->m_ComputerName = computer;
    d->m_State = StateInit;
-    d->m_TimeoutTimer = new QTimer(this);
-    d->m_TimeoutTimer->setSingleShot(true);
    d->m_Arguments = arguments;
-    connect(d->m_TimeoutTimer, &QTimer::timeout,
-            this, &Launcher::onComputerSeekTimeout);
 }

 Launcher::~Launcher()
@@ -197,12 +193,4 @@ void Launcher::onComputerSeekTimeout()
    d->handleEvent(event);
 }

-void Launcher::onComputerUpdated(NvComputer *computer)
-{
-    Q_D(Launcher);
-    Event event(Event::ComputerUpdated);
-    event.computer = computer;
-    d->handleEvent(event);
-}
-
 }
@@ -27,7 +27,6 @@ public:

 private slots:
    void onComputerFound(NvComputer *computer);
-    void onComputerUpdated(NvComputer *computer);
    void onComputerSeekTimeout();

 private:
@@ -162,7 +162,7 @@ public:

    QString getCurrentAppName() const
    {
-        for (const NvApp& app : m_Computer->appList) {
+        for (const NvApp& app : std::as_const(m_Computer->appList)) {
            if (m_Computer->currentGameId == app.id) {
                return app.name;
            }
@@ -1,40 +0,0 @@
-From 78261eb6e2fe728fa5d3843b5b8962b1ca559b7e Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Sat, 16 Dec 2023 14:52:01 +0100
-Subject: [PATCH] Vulkan: Don't try to reuse old swapchain
-
---
- src/vulkan/swapchain.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
-index 0646e57c..c0b07ce4 100644
--- a/src/vulkan/swapchain.c
-+++ b/src/vulkan/swapchain.c
-@@ -612,13 +612,21 @@ static bool vk_sw_recreate(pl_swapchain sw, int w, int h)
-     }
- #endif
- 
-+    {
-+        pl_gpu_flush(gpu);
-+        vk_wait_idle(vk);
-+        for (int i = 0; i < vk->pool_graphics->num_queues; i++)
-+            vk->QueueWaitIdle(vk->pool_graphics->queues[i]);
-+        vk->DestroySwapchainKHR(vk->dev, p->swapchain, PL_VK_ALLOC);
-+    }
-+
-     // Calling `vkCreateSwapchainKHR` puts sinfo.oldSwapchain into a retired
-     // state whether the call succeeds or not, so we always need to garbage
-     // collect it afterwards - asynchronously as it may still be in use
-    sinfo.oldSwapchain = p->swapchain;
-+    /* sinfo.oldSwapchain = p->swapchain; */
-     p->swapchain = VK_NULL_HANDLE;
-     VkResult res = vk->CreateSwapchainKHR(vk->dev, &sinfo, PL_VK_ALLOC, &p->swapchain);
-    vk_dev_callback(vk, VK_CB_FUNC(destroy_swapchain), vk, vk_wrap_handle(sinfo.oldSwapchain));
-+    /* vk_dev_callback(vk, VK_CB_FUNC(destroy_swapchain), vk, vk_wrap_handle(sinfo.oldSwapchain)); */
-     PL_VK_ASSERT(res, "vk->CreateSwapchainKHR(...)");
- 
-     // Get the new swapchain images
-- 
-2.43.0
-
@@ -0,0 +1,13 @@
+diff --git a/src/vulkan/context.c b/src/vulkan/context.c
+index bc9084ad..52290154 100644
+--- a/src/vulkan/context.c
+++ b/src/vulkan/context.c
+@@ -265,7 +265,7 @@ static_assert(PL_ARRAY_SIZE(pl_vulkan_recommended_extensions) + 1 ==
+ #ifdef VK_KHR_internally_synchronized_queues
+ static const VkPhysicalDeviceInternallySynchronizedQueuesFeaturesKHR synchronized_queues = {
+     .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INTERNALLY_SYNCHRONIZED_QUEUES_FEATURES_KHR,
+-    .internallySynchronizedQueues = true,
+    .internallySynchronizedQueues = false,
+ };
+ #endif
+ 
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
+<component type="desktop-application">
 	<id>com.moonlight_stream.Moonlight</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0+</project_license>
@@ -10,7 +10,7 @@
 		<p>Moonlight can stream games and other applications from another PC with Sunshine or GeForce Experience software installed.</p>
 		<p>Features include:</p>
 		<ul>
-			<li>Hardware accelerated video decoding with VAAPI, VDPAU, and NVDEC support</li>
+			<li>Hardware accelerated video decoding with VAAPI, VDPAU, and Vulkan Video support</li>
 			<li>H.264, HEVC, and AV1 codec support</li>
 			<li>7.1 surround sound audio support</li>
 			<li>10-point multitouch support</li>
@@ -23,17 +23,96 @@
 	<url type="homepage">https://moonlight-stream.org</url>
 	<url type="bugtracker">https://github.com/moonlight-stream/moonlight-qt/issues</url>
 	<url type="help">https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide</url>
+	<url type="vcs-browser">https://github.com/moonlight-stream/moonlight-qt</url>
+	<developer id="org.moonlight-stream">
+		<name>Moonlight Game Streaming Team</name>
+	</developer>
+	<update_contact>cameron@moonlight-stream.org</update_contact>
+	<launchable type="desktop-id">com.moonlight_stream.Moonlight.desktop</launchable>
+	<provides>
+		<binary>moonlight</binary>
+	</provides>
+	<content_rating type="oars-1.1" />	
+
+	<branding>
+		<color type="primary" scheme_preference="light">#710085</color>
+		<color type="primary" scheme_preference="dark">#55285d</color>
+	</branding>

 	<screenshots>
 		<screenshot type="default">
 			<image>https://moonlight-stream.org/appstream_resources/moonlight_screenshot_1.png</image>
+			<caption>Host selection page showing local PCs</caption>
 		</screenshot>
 		<screenshot>
 			<image>https://moonlight-stream.org/appstream_resources/moonlight_screenshot_2.png</image>
+			<caption>Settings page displaying streaming options</caption>
 		</screenshot>
 	</screenshots>

 	<releases>
+		<release version="6.2.0" date="2026-10-03">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Ctrl+Alt+Shift+K has been added to toggle system keyboard grab</li>
+					<li>Added support for DualSense adaptive triggers (requires a compatible host)</li>
+					<li>Gamepads with a second trackpad can now be passed to the host (requires host support)</li>
+					<li>Client identifiers are now provided to the host to allow client-specific session management</li>
+					<li>Added an option to disable pre-launch warnings</li>
+				</ul>
+				<p>Behavior Changes:</p>
+				<ul>
+					<li>Most video renderers now use full range color instead of limited range</li>
+					<li>The cursor is now also locked to the video area in single display borderless windowed scenarios. This was previously only done in true full-screen mode.</li>
+					<li>The cursor is no longer captured by default in windowed mode. Clicking on the streaming window or pressing Ctrl+Alt+Shift+Z will capture the cursor.</li>
+					<li>GPUs on non-x86 Linux platforms are now assumed to be slow by default, which enables a number of optimizations for improved performance. GL_IS_SLOW=0/VULKAN_IS_SLOW=0 can be set at runtime to override this.</li>
+					<li>The default streaming resolution for new installs is now 1080p instead of 720p.</li>
+					<li>Video bitrate no longer resets when adjusting resolution or frame rate if it's already been manually adjusted</li>
+				</ul>
+				<p>Security:</p>
+				<ul>
+					<li>CVE-2026-33546, CVE-2026-33547, and CVE-2026-41210 have been fixed</li>
+					<li>These vulnerabilities could allow a malicious host to crash Moonlight when connecting</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Reduced background CPU usage</li>
+					<li>Improved startup, settings page, and stream load times</li>
+					<li>Optimized the EGL/GLES renderer to improve performance on low end GPUs and embedded devices</li>
+					<li>Fixed EGL/GLES renderer failures under X11 when GLX was used for the UI</li>
+					<li>Improved readability of the statistics overlay by adding an outline</li>
+					<li>Improved timing accuracy in the statistics overlay</li>
+					<li>Improved performance when multiple gamepads are sending input simultaneously</li>
+					<li>Improved performance when recovering from dropped network packets</li>
+					<li>Fixed black or green padding being rendered on the bottom or right side of the video stream when streaming from certain hosts</li>
+					<li>Fixed horizontal scroll direction not being correctly inverted when requested</li>
+					<li>Fixed Moonlight not exiting after an abnormal stream termination when launched via the CLI</li>
+					<li>Fixed failure to start on Linux systems where desktop OpenGL is not available</li>
+					<li>Fixed broken overlay rendering on PowerVR systems using the proprietary driver</li>
+					<li>Fixed automatic selection of AV1 on systems where HEVC is not available</li>
+					<li>Fixed instability when using VAAPI decoding under X11</li>
+					<li>Fixed small deviations in chroma co-siting and color conversion</li>
+					<li>Fixed suboptimal format selection on some V4L2 decoders</li>
+					<li>Fixed handling of some non-US keyboard layouts</li>
+					<li>Fixed stale app list being displayed when using CLI commands</li>
+					<li>Fixed handling of IPv6 literals that are not URL-escaped</li>
+					<li>Fixed AV1 Vulkan Video decoding on newer versions of FFmpeg</li>
+					<li>Fixed Ctrl+C/SIGTERM when running from the console</li>
+					<li>Fixed several GUI interoperability issues with Qt 6.9 and later</li>
+					<li>Fixed the IME or software keyboard being unexpectedly displayed in various situations</li>
+					<li>Fixed launching in a new VT while a Wayland compositor is running</li>
+					<li>Fixed moving focus from the app grid into the toolbar via the gamepad or keyboard</li>
+					<li>Fixed a possible crash in the Vulkan renderer when disabling an overlay</li>
+					<li>Fixed keyboard grab not working under sdl2-compat on Wayland compositors that lack support for keyboard-shortcuts-inhibit-unstable-v1</li>
+					<li>Fixed CLI stream launch causing the saved manual address to be overwritten</li>
+					<li>Fixed distinguishing between Enter and Numpad Enter keys (requires updated host software)</li>
+					<li>Fixed mDNS discovering unexpected devices after running for a period of time</li>
+					<li>Fixed libdecor-gtk window decorations not being displayed on the streaming window</li>
+					<li>Updated community-contributed translations from Weblate</li>
+				</ul>
+			</description>
+		</release>
 		<release version="6.1.0" date="2024-09-16">
 			<description>
 				<p>New features:</p>
@@ -816,19 +895,4 @@
 		</release>
 	</releases>

-	<categories>
-		<category>Game</category>
-		<category>Qt</category>
-	</categories>
-
-	<developer_name>Moonlight Game Streaming Team</developer_name>
-	<update_contact>cameron@moonlight-stream.org</update_contact>
-
-	<launchable type="desktop-id">com.moonlight_stream.Moonlight.desktop</launchable>
-
-	<provides>
-		<binary>moonlight</binary>
-	</provides>
-
-	<content_rating type="oars-1.0" />
 </component>
@@ -5,5 +5,5 @@ Exec=moonlight
 Icon=moonlight
 Terminal=false
 Type=Application
-Categories=Qt;Game;
+Categories=Qt;Game;Network;RemoteAccess;
 Keywords=nvidia;gamestream;stream;sunshine;remote play;
@@ -0,0 +1,36 @@
+/*
+ * libva-probe: loadability oracle for the AppImage AppRun.
+ *
+ * Moonlight and the bundled FFmpeg import libva through symbols carrying
+ * VA_API_* ELF version nodes. Whether the libva installed on the host can
+ * satisfy those requirements cannot be inferred portably from file names or
+ * loader caches, so this program embeds the same DT_NEEDED entries and
+ * versioned symbol references as those binaries without ever calling into
+ * them: either the dynamic loader resolves everything and main() runs (the
+ * host libva is usable), or the exec itself fails and AppRun must fall back
+ * to the build-environment libva staged next to this binary.
+ *
+ * scripts/build-appimage.sh verifies at build time that this file references
+ * every VA_API_* node required by the binaries shipped in the AppImage, so
+ * it stays automatically in sync with the libva usage there.
+ */
+
+#include <stddef.h>
+
+#include <va/va.h>
+#include <va/va_x11.h>
+
+/* Address references are enough: they produce relocations against the
+ * versioned symbols, which is what makes the loader check the host's
+ * VA_API_* version nodes. The functions must never actually be called.
+ * volatile keeps the table (and its relocations) alive through -O2. */
+static void *volatile requirements[] = {
+    (void *)vaCreateSurfaces, /* libva.so.2, VA_API_0.33.0 */
+    (void *)vaMapBuffer2,     /* libva.so.2, 2.21+ */
+    (void *)vaGetDisplay,     /* libva-x11.so.2 */
+};
+
+int main(void)
+{
+    return requirements[0] == NULL;
+}
@@ -9,6 +9,11 @@ HOME=/usr/local/moonlight
 # https://github.com/moonlight-stream/moonlight-qt/issues/697
 export SDL_ENABLE_STEAM_CONTROLLERS=1

+# Disable gamepad sensors by default to avoid excessive CPU
+# usage that can cause audio glitches. Remove the following
+# line to enable gamepad sensors.
+export SENSOR_REPORT_RATE_LIMIT_HZ=0
+
 # Renice PE_Single_CPU which seems to host A/V stuff
 renice -10 -p $(pidof PE_Single_CPU)

@@ -38,7 +38,7 @@ CenteredGridView {
        activated = true

        // Highlight the first item if a gamepad is connected
-        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
+        if (currentIndex === -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
            currentIndex = 0
        }

@@ -94,9 +94,9 @@ CenteredGridView {
                // the image size checks if this is not an app collector game. We know the officially
                // supported games all have box art, so this check is not required.
                if (!model.isAppCollectorGame &&
-                    ((sourceSize.width == 130 && sourceSize.height == 180) || // GFE 2.0 placeholder image
-                     (sourceSize.width == 628 && sourceSize.height == 888) || // GFE 3.0 placeholder image
-                     (sourceSize.width == 200 && sourceSize.height == 266)))  // Our no_app_image.png
+                    ((sourceSize.width === 130 && sourceSize.height === 180) || // GFE 2.0 placeholder image
+                     (sourceSize.width === 628 && sourceSize.height === 888) || // GFE 3.0 placeholder image
+                     (sourceSize.width === 200 && sourceSize.height === 266)))  // Our no_app_image.png
                {
                    isPlaceholder = true
                }
@@ -123,20 +123,18 @@ CenteredGridView {

            sourceComponent: Item {
                RoundButton {
+                    // Don't steal focus from the toolbar buttons
+                    focusPolicy: Qt.NoFocus
+
                    anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
                    anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
                    anchors.centerIn: parent
                    implicitWidth: 85
                    implicitHeight: 85

-                    Image {
-                        source: "qrc:/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg"
-                        anchors.centerIn: parent
-                        sourceSize {
-                            width: 75
-                            height: 75
-                        }
-                    }
+                    icon.source: "qrc:/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg"
+                    icon.width: 75
+                    icon.height: 75

                    onClicked: {
                        launchOrResumeSelectedApp(true)
@@ -151,20 +149,18 @@ CenteredGridView {
                }

                RoundButton {
+                    // Don't steal focus from the toolbar buttons
+                    focusPolicy: Qt.NoFocus
+
                    anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
                    anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
                    anchors.centerIn: parent
                    implicitWidth: 85
                    implicitHeight: 85

-                    Image {
-                        source: "qrc:/res/stop_FILL1_wght700_GRAD200_opsz48.svg"
-                        anchors.centerIn: parent
-                        sourceSize {
-                            width: 75
-                            height: 75
-                        }
-                    }
+                    icon.source: "qrc:/res/stop_FILL1_wght700_GRAD200_opsz48.svg"
+                    icon.width: 75
+                    icon.height: 75

                    onClicked: {
                        doQuitGame()
@@ -298,19 +294,17 @@ CenteredGridView {
            asynchronous: true
            sourceComponent: NavigableMenu {
                id: appContextMenu
+                initiator: appContextMenuLoader.parent
                NavigableMenuItem {
-                    parentMenu: appContextMenu
                    text: model.running ? qsTr("Resume Game") : qsTr("Launch Game")
                    onTriggered: launchOrResumeSelectedApp(true)
                }
                NavigableMenuItem {
-                    parentMenu: appContextMenu
                    text: qsTr("Quit Game")
                    onTriggered: doQuitGame()
                    visible: model.running
                }
                NavigableMenuItem {
-                    parentMenu: appContextMenu
                    checkable: true
                    checked: model.directLaunch
                    text: qsTr("Direct Launch")
@@ -323,7 +317,6 @@ CenteredGridView {
                    ToolTip.visible: hovered
                }
                NavigableMenuItem {
-                    parentMenu: appContextMenu
                    checkable: true
                    checked: model.hidden
                    text: qsTr("Hide Game")
@@ -339,6 +332,19 @@ CenteredGridView {
        }
    }

+    Row {
+        anchors.centerIn: parent
+        spacing: 5
+        visible: appGrid.count === 0
+
+        Label {
+            text: qsTr("This computer doesn't seem to have any applications or some applications are hidden")
+            font.pointSize: 20
+            verticalAlignment: Text.AlignVCenter
+            wrapMode: Text.Wrap
+        }
+    }
+
    NavigableMessageDialog {
        id: quitAppDialog
        property string appName : ""
@@ -50,4 +50,12 @@ ComboBox {
    popup.onAboutToHide: {
        SdlGamepadKeyNavigation.setUiNavMode(true)
    }
+
+    Keys.onLeftPressed: {
+        decrementCurrentIndex()
+    }
+
+    Keys.onRightPressed: {
+        incrementCurrentIndex()
+    }
 }
@@ -2,10 +2,6 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2

 GridView {
-    // Detect Qt 5.11 or earlier using presence of synchronousDrag.
-    // Prior to 5.12, the leftMargin and rightMargin values did not work.
-    property bool hasBrokenMargins: this.synchronousDrag === undefined
-
    property int minMargin: 10
    property real availableWidth: (parent.width - 2 * minMargin)
    property int itemsPerRow: availableWidth / cellWidth
@@ -15,11 +11,6 @@ GridView {
    function updateMargins() {
        leftMargin = horizontalMargin
        rightMargin = horizontalMargin
-
-        if (hasBrokenMargins) {
-            anchors.leftMargin = leftMargin
-            anchors.rightMargin = rightMargin
-        }
    }

    onHorizontalMarginChanged: {
@@ -27,15 +18,6 @@ GridView {
    }

    Component.onCompleted: {
-        if (hasBrokenMargins) {
-            // This will cause an anchor conflict with the parent StackView
-            // which breaks animation, but otherwise the grid will not be
-            // centered in the window.
-            anchors.fill = parent
-            anchors.topMargin = topMargin
-            anchors.bottomMargin = bottomMargin
-        }
-
        updateMargins()
    }

@@ -53,6 +53,7 @@ Item {

        BusyIndicator {
            id: stageSpinner
+            running: visible
        }

        Label {
@@ -34,6 +34,7 @@ Item {

        BusyIndicator {
            id: stageSpinner
+            running: visible
        }

        Label {
@@ -52,6 +52,7 @@ Item {

        BusyIndicator {
            id: stageSpinner
+            running: visible
        }

        Label {
@@ -1,17 +1,13 @@
 import QtQuick 2.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.5

 Dialog {
-    // We should use Overlay.overlay here but that's not available in Qt 5.9 :(
-    parent: ApplicationWindow.contentItem
+    modal: true
+    anchors.centerIn: Overlay.overlay

-    x: Math.round((parent.width - width) / 2)
-    y: Math.round((parent.height - height) / 2)
-
-    onAboutToHide: {
-        // We must force focus back to the last item for platforms without
-        // support for more than one active window like Steam Link. If
-        // we don't, gamepad and keyboard navigation will break after a
+    onClosed: {
+        // We must force focus back to the last item. If we don't,
+        // gamepad and keyboard navigation will break after a
        // dialog appears.
        stackView.forceActiveFocus()
    }
@@ -17,6 +17,11 @@ ItemDelegate {
    }
    Keys.onUpPressed: {
        grid.moveCurrentIndexUp()
+
+        // If we've reached the top of the grid, move focus to the toolbar
+        if (grid.currentItem === this) {
+            nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocus)
+        }
    }
    Keys.onReturnPressed: {
        clicked()
@@ -2,13 +2,18 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 Menu {
+    property var initiator
+
    onOpened: {
-        // Give focus to the first visible and enabled menu item
-        for (var i = 0; i < count; i++) {
-            var item = itemAt(i)
-            if (item.visible && item.enabled) {
-                item.forceActiveFocus(Qt.TabFocusReason)
-                break
+        // If the initiating object currently has keyboard focus,
+        // give focus to the first visible and enabled menu item
+        if (initiator.focus) {
+            for (var i = 0; i < count; i++) {
+                var item = itemAt(i)
+                if (item.visible && item.enabled) {
+                    item.forceActiveFocus(Qt.TabFocusReason)
+                    break
+                }
            }
        }
    }
@@ -2,10 +2,6 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 MenuItem {
-    // Qt 5.10 has a menu property, but we need to support 5.9
-    // so we must make our own.
-    property Menu parentMenu
-
    // Ensure focus can't be given to an invisible item
    enabled: visible
    height: visible ? implicitHeight : 0
@@ -15,7 +11,7 @@ MenuItem {
        // We must close the context menu first or
        // it can steal focus from any dialogs that
        // onTriggered may spawn.
-        parentMenu.close()
+        menu.close()
    }

    Keys.onReturnPressed: {
@@ -27,6 +23,6 @@ MenuItem {
    }

    Keys.onEscapePressed: {
-        parentMenu.close()
+        menu.close()
    }
 }
@@ -15,7 +15,9 @@ NavigableDialog {

    onOpened: {
        // Force keyboard focus on the label so keyboard navigation works
-        dialogLabel.forceActiveFocus()
+        if (dialogButtonBox.count > 0) {
+            dialogButtonBox.itemAt(dialogButtonBox.count - 1).forceActiveFocus(Qt.TabFocus)
+        }
    }

    RowLayout {
@@ -24,6 +26,7 @@ NavigableDialog {
        BusyIndicator {
            id: dialogSpinner
            visible: false
+            running: visible
        }

        Image {
@@ -51,18 +54,6 @@ NavigableDialog {
            // will cause word wrap to kick in.
            Layout.maximumWidth: 400
            Layout.maximumHeight: 400
-
-            Keys.onReturnPressed: {
-                accept()
-            }
-
-            Keys.onEnterPressed: {
-                accept()
-            }
-
-            Keys.onEscapePressed: {
-                reject()
-            }
        }
    }

@@ -70,6 +61,15 @@ NavigableDialog {
        id: dialogButtonBox
        standardButtons: dialog.standardButtons

+        delegate: Button {
+            flat: true
+
+            Keys.onReturnPressed: clicked()
+            Keys.onEnterPressed: clicked()
+            Keys.onRightPressed: nextItemInFocusChain(true).forceActiveFocus(Qt.TabFocus)
+            Keys.onLeftPressed: nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocus)
+        }
+
        onHelpRequested: {
            Qt.openUrlExternally(helpUrl)
            close()
@@ -7,17 +7,9 @@ ToolButton {

    activeFocusOnTab: true

-    // FIXME: We're using an Image here rather than icon.source because
-    // icons don't work on Qt 5.9 LTS.
-    Image {
-        id: image
-        source: iconSource
-        anchors.centerIn: parent.background
-        sourceSize {
-            width: parent.background.width * 1.10
-            height: parent.background.height * 1.10
-        }
-    }
+    icon.source: iconSource
+    icon.width: background.width
+    icon.height: background.height

    // This determines the size of the Material highlight. We increase it
    // from the default because we use larger than normal icons for TV readability.
@@ -35,7 +35,7 @@ CenteredGridView {
        ComputerManager.computerAddCompleted.connect(addComplete)

        // Highlight the first item if a gamepad is connected
-        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
+        if (currentIndex === -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
            currentIndex = 0
        }
    }
@@ -90,6 +90,7 @@ CenteredGridView {
        BusyIndicator {
            id: searchSpinner
            visible: StreamingPreferences.enableMdns
+            running: visible
        }

        Label {
@@ -143,6 +144,7 @@ CenteredGridView {
            width: 75
            height: 75
            visible: model.statusUnknown
+            running: visible
        }

        Label {
@@ -163,13 +165,13 @@ CenteredGridView {
            asynchronous: true
            sourceComponent: NavigableMenu {
                id: pcContextMenu
+                initiator: pcContextMenuLoader.parent
                MenuItem {
                    text: qsTr("PC Status: %1").arg(model.online ? qsTr("Online") : qsTr("Offline"))
                    font.bold: true
                    enabled: false
                }
                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("View All Apps")
                    onTriggered: {
                        var component = Qt.createComponent("AppView.qml")
@@ -179,13 +181,11 @@ CenteredGridView {
                    visible: model.online && model.paired
                }
                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("Wake PC")
                    onTriggered: computerModel.wakeComputer(index)
                    visible: !model.online && model.wakeable
                }
                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("Test Network")
                    onTriggered: {
                        computerModel.testConnectionForComputer(index)
@@ -194,7 +194,6 @@ CenteredGridView {
                }

                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("Rename PC")
                    onTriggered: {
                        renamePcDialog.pcIndex = index
@@ -203,7 +202,6 @@ CenteredGridView {
                    }
                }
                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("Delete PC")
                    onTriggered: {
                        deletePcDialog.pcIndex = index
@@ -212,7 +210,6 @@ CenteredGridView {
                    }
                }
                NavigableMenuItem {
-                    parentMenu: pcContextMenu
                    text: qsTr("View Details")
                    onTriggered: {
                        showPcDetailsDialog.pcDetails = model.details
@@ -293,10 +290,6 @@ CenteredGridView {

    NavigableMessageDialog {
        id: pairDialog
-
-        // Pairing dialog must be modal to prevent double-clicks from triggering
-        // pairing twice
-        modal: true
        closePolicy: Popup.CloseOnEscape

        // don't allow edits to the rest of the window while open
@@ -60,6 +60,7 @@ Item {

        BusyIndicator {
            id: stageSpinner
+            running: visible
        }

        Label {
@@ -281,11 +281,13 @@ Flickable {
                                StreamingPreferences.width = selectedWidth
                                StreamingPreferences.height = selectedHeight

-                                StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
-                                                                                                          StreamingPreferences.height,
-                                                                                                          StreamingPreferences.fps,
-                                                                                                          StreamingPreferences.enableYUV444);
-                                slider.value = StreamingPreferences.bitrateKbps
+                                if (StreamingPreferences.autoAdjustBitrate) {
+                                    StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
+                                                                                                              StreamingPreferences.height,
+                                                                                                              StreamingPreferences.fps,
+                                                                                                              StreamingPreferences.enableYUV444);
+                                    slider.value = StreamingPreferences.bitrateKbps
+                                }
                            }

                            lastIndexValue = currentIndex
@@ -447,11 +449,13 @@ Flickable {
                            if (StreamingPreferences.fps !== selectedFps) {
                                StreamingPreferences.fps = selectedFps

-                                StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
-                                                                                                          StreamingPreferences.height,
-                                                                                                          StreamingPreferences.fps,
-                                                                                                          StreamingPreferences.enableYUV444);
-                                slider.value = StreamingPreferences.bitrateKbps
+                                if (StreamingPreferences.autoAdjustBitrate) {
+                                    StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
+                                                                                                              StreamingPreferences.height,
+                                                                                                              StreamingPreferences.fps,
+                                                                                                              StreamingPreferences.enableYUV444);
+                                    slider.value = StreamingPreferences.bitrateKbps
+                                }
                            }

                            lastIndexValue = currentIndex
@@ -678,26 +682,47 @@ Flickable {
                    wrapMode: Text.Wrap
                }

-                Slider {
-                    id: slider
+                Row {
+                    width: parent.width
+                    spacing: 5

-                    value: StreamingPreferences.bitrateKbps
+                    Slider {
+                        id: slider

-                    stepSize: 500
-                    from : 500
-                    to: StreamingPreferences.unlockBitrate ? 500000 : 150000
+                        value: StreamingPreferences.bitrateKbps

-                    snapMode: "SnapOnRelease"
-                    width: Math.min(bitrateDesc.implicitWidth, parent.width)
+                        stepSize: 500
+                        from : 500
+                        to: StreamingPreferences.unlockBitrate ? 500000 : 150000

-                    onValueChanged: {
-                        bitrateTitle.text = qsTr("Video bitrate: %1 Mbps").arg(value / 1000.0)
-                        StreamingPreferences.bitrateKbps = value
+                        snapMode: "SnapOnRelease"
+                        width: Math.min(bitrateDesc.implicitWidth, parent.width - (resetBitrateButton.visible ? resetBitrateButton.width + parent.spacing : 0))
+
+                        onValueChanged: {
+                            bitrateTitle.text = qsTr("Video bitrate: %1 Mbps").arg(value / 1000.0)
+                            StreamingPreferences.bitrateKbps = value
+                        }
+
+                        onMoved: {
+                            StreamingPreferences.autoAdjustBitrate = false
+                        }
+
+                        Component.onCompleted: {
+                            // Refresh the text after translations change
+                            languageChanged.connect(valueChanged)
+                        }
                    }

-                    Component.onCompleted: {
-                        // Refresh the text after translations change
-                        languageChanged.connect(valueChanged)
+                    Button {
+                        id: resetBitrateButton
+                        text: qsTr("Use Default (%1 Mbps)").arg(StreamingPreferences.getDefaultBitrate(StreamingPreferences.width, StreamingPreferences.height, StreamingPreferences.fps, StreamingPreferences.enableYUV444) / 1000.0)
+                        visible: StreamingPreferences.bitrateKbps !== StreamingPreferences.getDefaultBitrate(StreamingPreferences.width, StreamingPreferences.height, StreamingPreferences.fps, StreamingPreferences.enableYUV444)
+                        onClicked: {
+                            var defaultBitrate = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width, StreamingPreferences.height, StreamingPreferences.fps, StreamingPreferences.enableYUV444)
+                            StreamingPreferences.bitrateKbps = defaultBitrate
+                            StreamingPreferences.autoAdjustBitrate = true
+                            slider.value = defaultBitrate
+                        }
                    }
                }

@@ -787,38 +812,64 @@ Flickable {
                    ToolTip.text: qsTr("Fullscreen generally provides the best performance, but borderless windowed may work better with features like macOS Spaces, Alt+Tab, screenshot tools, on-screen overlays, etc.")
                }

-                CheckBox {
-                    id: vsyncCheck
+                Row {
+                    spacing: 5
                    width: parent.width
-                    hoverEnabled: true
-                    text: qsTr("V-Sync")
-                    font.pointSize:  12
-                    checked: StreamingPreferences.enableVsync
-                    onCheckedChanged: {
-                        StreamingPreferences.enableVsync = checked
+
+                    CheckBox {
+                        id: vsyncCheck
+                        hoverEnabled: true
+                        text: qsTr("V-Sync")
+                        font.pointSize:  12
+                        checked: StreamingPreferences.enableVsync
+                        onCheckedChanged: {
+                            StreamingPreferences.enableVsync = checked
+                        }
+
+                        ToolTip.delay: 1000
+                        ToolTip.timeout: 5000
+                        ToolTip.visible: hovered
+                        ToolTip.text: qsTr("Disabling V-Sync allows sub-frame rendering latency, but it can display visible tearing")
                    }

-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 5000
-                    ToolTip.visible: hovered
-                    ToolTip.text: qsTr("Disabling V-Sync allows sub-frame rendering latency, but it can display visible tearing")
+                    CheckBox {
+                        id: framePacingCheck
+                        hoverEnabled: true
+                        text: qsTr("Frame pacing")
+                        font.pointSize:  12
+                        enabled: StreamingPreferences.enableVsync
+                        checked: StreamingPreferences.enableVsync && StreamingPreferences.framePacing
+                        onCheckedChanged: {
+                            StreamingPreferences.framePacing = checked
+                        }
+                        ToolTip.delay: 1000
+                        ToolTip.timeout: 5000
+                        ToolTip.visible: hovered
+                        ToolTip.text: qsTr("Frame pacing reduces micro-stutter by delaying frames that come in too early")
+                    }
                }

                CheckBox {
-                    id: framePacingCheck
+                    id: enableHdr
                    width: parent.width
-                    hoverEnabled: true
-                    text: qsTr("Frame pacing")
-                    font.pointSize:  12
-                    enabled: StreamingPreferences.enableVsync
-                    checked: StreamingPreferences.enableVsync && StreamingPreferences.framePacing
+                    text: qsTr("Enable HDR")
+                    font.pointSize: 12
+
+                    enabled: SystemProperties.supportsHdr
+                    checked: enabled && StreamingPreferences.enableHdr
                    onCheckedChanged: {
-                        StreamingPreferences.framePacing = checked
+                        StreamingPreferences.enableHdr = checked
                    }
+
+                    // Updating StreamingPreferences.videoCodecConfig is handled above
+
                    ToolTip.delay: 1000
                    ToolTip.timeout: 5000
                    ToolTip.visible: hovered
-                    ToolTip.text: qsTr("Frame pacing reduces micro-stutter by delaying frames that come in too early")
+                    ToolTip.text: enabled ?
+                                      qsTr("The stream will be HDR-capable, but some games may require an HDR monitor on your host PC to enable HDR mode.")
+                                    :
+                                      qsTr("HDR streaming is not supported on this PC.")
                }
            }
        }
@@ -1072,10 +1123,10 @@ Flickable {
                            text: "Português" // Portuguese
                            val: StreamingPreferences.LANG_PT
                        }
-                        /* ListElement {
+                        ListElement {
                            text: "Português do Brasil" // Brazilian Portuguese
                            val: StreamingPreferences.LANG_PT_BR
-                        } */
+                        }
                        ListElement {
                            text: "Ελληνικά" // Greek
                            val: StreamingPreferences.LANG_EL
@@ -1112,6 +1163,18 @@ Flickable {
                            text: "Eesti" // Estonian
                            val: StreamingPreferences.LANG_ET
                        } */
+                        ListElement {
+                            text: "Български" // Bulgarian
+                            val: StreamingPreferences.LANG_BG
+                        }
+                        /* ListElement {
+                            text: "Esperanto"
+                            val: StreamingPreferences.LANG_EO
+                        } */
+                        ListElement {
+                            text: "தமிழ்" // Tamil
+                            val: StreamingPreferences.LANG_TA
+                        }
                    }
                    // ::onActivated must be used, as it only listens for when the index is changed by a human
                    onActivated : {
@@ -1199,6 +1262,17 @@ Flickable {
                    }
                }

+                CheckBox {
+                    id: configurationWarningsCheck
+                    width: parent.width
+                    text: qsTr("Show configuration warnings")
+                    font.pointSize: 12
+                    checked: StreamingPreferences.configurationWarnings
+                    onCheckedChanged: {
+                        StreamingPreferences.configurationWarnings = checked
+                    }
+                }
+
                CheckBox {
                    visible: SystemProperties.hasDiscordIntegration
                    id: discordPresenceCheck
@@ -1570,7 +1644,7 @@ Flickable {
                            val: StreamingPreferences.VCC_FORCE_HEVC
                        }
                        ListElement {
-                            text: qsTr("AV1 (Experimental)")
+                            text: qsTr("AV1")
                            val: StreamingPreferences.VCC_FORCE_AV1
                        }
                    }
@@ -1582,33 +1656,66 @@ Flickable {
                    }
                }

-                CheckBox {
-                    id: enableHdr
+                Label {
                    width: parent.width
-                    text: qsTr("Enable HDR (Experimental)")
+                    id: rendererTitle
+                    text: qsTr("Renderer")
                    font.pointSize: 12
+                    wrapMode: Text.Wrap
+                    visible: SystemProperties.isDarwin
+                }

-                    enabled: SystemProperties.supportsHdr
-                    checked: enabled && StreamingPreferences.enableHdr
-                    onCheckedChanged: {
-                        StreamingPreferences.enableHdr = checked
+                AutoResizingComboBox {
+                    // ignore setting the index at first, and actually set it when the component is loaded
+                    Component.onCompleted: {
+                        var saved_rs = StreamingPreferences.rendererSelection
+
+                        // Default to Automatic
+                        currentIndex = 0
+
+                        for(var i = 0; i < rendererListModel.count; i++) {
+                            var el_rs = rendererListModel.get(i).val;
+                            if (saved_rs === el_rs) {
+                                currentIndex = i
+                                break
+                            }
+                        }
+
+                        activated(currentIndex)
                    }

-                    // Updating StreamingPreferences.videoCodecConfig is handled above
-
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 5000
-                    ToolTip.visible: hovered
-                    ToolTip.text: enabled ?
-                                      qsTr("The stream will be HDR-capable, but some games may require an HDR monitor on your host PC to enable HDR mode.")
-                                    :
-                                      qsTr("HDR streaming is not supported on this PC.")
+                    id: rendererComboBox
+                    visible: SystemProperties.isDarwin
+                    textRole: "text"
+                    model: ListModel {
+                        id: rendererListModel
+                        ListElement {
+                            text: qsTr("Automatic (Recommended)")
+                            val: StreamingPreferences.RS_AUTO
+                        }
+                        ListElement {
+                            text: "Vulkan"
+                            val: StreamingPreferences.RS_VULKAN
+                        }
+                        ListElement {
+                            text: "Metal"
+                            val: StreamingPreferences.RS_METAL
+                        }
+                        ListElement {
+                            text: "AVSampleBufferDisplayLayer"
+                            val: StreamingPreferences.RS_AVSBDL
+                        }
+                    }
+                    // ::onActivated must be used, as it only listens for when the index is changed by a human
+                    onActivated : {
+                        StreamingPreferences.rendererSelection = rendererListModel.get(currentIndex).val
+                    }
                }

                CheckBox {
                    id: enableYUV444
                    width: parent.width
-                    text: qsTr("Enable YUV 4:4:4 (Experimental)")
+                    text: qsTr("Enable YUV 4:4:4")
                    font.pointSize: 12

                    checked: StreamingPreferences.enableYUV444
@@ -1616,11 +1723,13 @@ Flickable {
                        // This is called on init, so only reset to default bitrate when checked state changes.
                        if (StreamingPreferences.enableYUV444 != checked) {
                            StreamingPreferences.enableYUV444 = checked
-                            StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
-                                                                                                      StreamingPreferences.height,
-                                                                                                      StreamingPreferences.fps,
-                                                                                                      StreamingPreferences.enableYUV444);
-                            slider.value = StreamingPreferences.bitrateKbps
+                            if (StreamingPreferences.autoAdjustBitrate) {
+                                StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
+                                                                                                          StreamingPreferences.height,
+                                                                                                          StreamingPreferences.fps,
+                                                                                                          StreamingPreferences.enableYUV444);
+                                slider.value = StreamingPreferences.bitrateKbps
+                            }
                        }
                    }

@@ -4,6 +4,7 @@ import QtQuick.Window 2.2

 import SdlGamepadKeyNavigation 1.0
 import Session 1.0
+import SystemProperties 1.0

 Item {
    property Session session
@@ -48,18 +49,6 @@ Item {
        console.error(text)
    }

-    function displayLaunchWarning(text)
-    {
-        // This toast appears for 3 seconds, just shorter than how long
-        // Session will wait for it to be displayed. This gives it time
-        // to transition to invisible before continuing.
-        var toast = Qt.createQmlObject('import QtQuick.Controls 2.2; ToolTip {}', parent, '')
-        toast.text = text
-        toast.timeout = 3000
-        toast.visible = true
-        console.warn(text)
-    }
-
    function quitStarting()
    {
        // Avoid the push transition animation
@@ -79,20 +68,16 @@ Item {
        // Re-enable GUI gamepad usage now
        SdlGamepadKeyNavigation.enable()

-        if (quitAfter) {
-            if (streamSegueErrorDialog.text) {
-                // Quit when the error dialog is acknowledged
-                streamSegueErrorDialog.quitAfter = quitAfter
-                streamSegueErrorDialog.open()
-            }
-            else {
-                // Quit immediately
-                Qt.quit()
-            }
-        } else {
-            // Exit this view
+        // Pop the StreamSegue off the stack if this is a GUI-based app launch
+        if (!quitAfter) {
            stackView.pop()
+        }

+        if (quitAfter && !streamSegueErrorDialog.text) {
+            // If this was a CLI launch without errors, exit now
+            Qt.quit()
+        }
+        else {
            // Show the Qt window again after streaming
            window.visible = true

@@ -132,26 +117,29 @@ Item {
        session.stageFailed.connect(stageFailed)
        session.connectionStarted.connect(connectionStarted)
        session.displayLaunchError.connect(displayLaunchError)
-        session.displayLaunchWarning.connect(displayLaunchWarning)
        session.quitStarting.connect(quitStarting)
        session.sessionFinished.connect(sessionFinished)
        session.readyForDeletion.connect(sessionReadyForDeletion)

+        // Ensure the SystemProperties async thread is finished,
+        // since it may currently be using the SDL video subsystem
+        SystemProperties.waitForAsyncLoad()
+
        // Kick off the stream
-        spinnerTimer.start()
        streamLoader.active = true
    }

    Timer {
-        id: spinnerTimer
+        id: startSessionTimer
+        onTriggered: {
+            // Garbage collect QML stuff before we start streaming,
+            // since we'll probably be streaming for a while and we
+            // won't be able to GC during the stream.
+            gc()

-        // Display the spinner appearance a bit to allow us to reach
-        // the code in Session.exec() that pumps the event loop.
-        // If we display it immediately, it will briefly hang in the
-        // middle of the animation on Windows, which looks very
-        // obviously broken.
-        interval: 100
-        onTriggered: stageSpinner.running = true
+            // Run the streaming session to completion
+            session.start()
+        }
    }

    Loader {
@@ -170,13 +158,43 @@ Item {
            // Stop GUI gamepad usage now
            SdlGamepadKeyNavigation.disable()

-            // Garbage collect QML stuff before we start streaming,
-            // since we'll probably be streaming for a while and we
-            // won't be able to GC during the stream.
-            gc()
+            // Initialize the session and probe for host/client capabilities
+            if (!session.initialize(window)) {
+                sessionFinished(0);
+                sessionReadyForDeletion();
+                return;
+            }

-            // Run the streaming session to completion
-            session.exec(Window.window)
+            // This spinner is shown only after session.initialize() has completed
+            // to prevent active animations from running during decoder probing,
+            // which causes re-entrant event loop livelocks with libdecor-gtk.
+            stageSpinner.visible = true
+
+            // Don't wait unless we have toasts to display
+            startSessionTimer.interval = 0
+
+            // Display the toasts together in a vertical centered arrangement
+            var yOffset = 0
+            for (var i = 0; i < session.launchWarnings.length; i++) {
+                var text = session.launchWarnings[i]
+                console.warn(text)
+
+                // Show the tooltip for 3 seconds
+                var toast = Qt.createQmlObject('import QtQuick.Controls 2.2; ToolTip {}', parent, '')
+                toast.timeout = 3000
+                toast.text = text
+                toast.y += yOffset
+                toast.visible = true
+
+                // Offset the next toast below the previous one
+                yOffset = toast.y + toast.padding + toast.height
+
+                // Allow an extra 500 ms for the tooltip's fade-out animation to finish
+                startSessionTimer.interval = toast.timeout + 500;
+            }
+
+            // Start the timer to wait for toasts (or start the session immediately)
+            startSessionTimer.start()
        }

        sourceComponent: Item {}
@@ -188,7 +206,8 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: false
+            running: visible
+            visible: false
        }

        Label {
@@ -120,7 +120,7 @@ void AppModel::quitRunningApp()

 bool AppModel::isAppCurrentlyVisible(const NvApp& app)
 {
-    for (const NvApp& visibleApp : m_VisibleApps) {
+    for (const NvApp& visibleApp : std::as_const(m_VisibleApps)) {
        if (app.id == visibleApp.id) {
            return true;
        }
@@ -156,7 +156,7 @@ void AppModel::updateAppList(QVector<NvApp> newList)
        const NvApp& existingApp = m_VisibleApps.at(i);

        bool found = false;
-        for (const NvApp& newApp : newVisibleList) {
+        for (const NvApp& newApp : std::as_const(newVisibleList)) {
            if (existingApp.id == newApp.id) {
                // If the data changed, update it in our list
                if (existingApp != newApp) {
@@ -178,7 +178,7 @@ void AppModel::updateAppList(QVector<NvApp> newList)
    }

    // Process additions now
-    for (const NvApp& newApp : newVisibleList) {
+    for (const NvApp& newApp : std::as_const(newVisibleList)) {
        int insertionIndex = m_VisibleApps.size();
        bool found = false;

@@ -51,10 +51,20 @@ ApplicationWindow {
        }

        // Display any modal dialogs for configuration warnings
-        if (SystemProperties.isWow64) {
-            wow64Dialog.open()
+        if (runConfigChecks) {
+            if (SystemProperties.isWow64) {
+                wow64Dialog.open()
+            }
+
+            // Hardware acceleration and unmapped gamepads are checked asynchronously
+            SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
+            SystemProperties.unmappedGamepadsChanged.connect(hasUnmappedGamepadsChanged)
+            SystemProperties.startAsyncLoad()
        }
-        else if (!SystemProperties.hasHardwareAcceleration) {
+    }
+
+    function hasHardwareAccelerationChanged() {
+        if (!SystemProperties.hasHardwareAcceleration && StreamingPreferences.videoDecoderSelection !== StreamingPreferences.VDS_FORCE_SOFTWARE) {
            if (SystemProperties.isRunningXWayland) {
                xWaylandDialog.open()
            }
@@ -62,16 +72,28 @@ ApplicationWindow {
                noHwDecoderDialog.open()
            }
        }
+    }

+    function hasUnmappedGamepadsChanged() {
        if (SystemProperties.unmappedGamepads) {
            unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
            unmappedGamepadDialog.open()
        }
    }
-  
+
+    // It would be better to use TextMetrics here, but it always lays out
+    // the text slightly more compactly than real Text does in ToolTip,
+    // causing unexpected line breaks to be inserted
+    Text {
+        id: tooltipTextLayoutHelper
+        visible: false
+        font: ToolTip.toolTip.font
+        text: ToolTip.toolTip.text
+    }
+
    // This configures the maximum width of the singleton attached QML ToolTip. If left unconstrained,
    // it will never insert a line break and just extend on forever.
-    ToolTip.toolTip.contentWidth: ToolTip.toolTip.implicitContentWidth < 400 ? ToolTip.toolTip.implicitContentWidth : 400
+    ToolTip.toolTip.contentWidth: Math.min(tooltipTextLayoutHelper.width, 400)

    function goBack() {
        if (clearOnBack) {
@@ -195,20 +217,10 @@ ApplicationWindow {
        SdlGamepadKeyNavigation.notifyWindowFocus(visible && active)
    }

-    // Workaround for lack of instanceof in Qt 5.9.
-    //
-    // Based on https://stackoverflow.com/questions/13923794/how-to-do-a-is-a-typeof-or-instanceof-in-qml
-    function qmltypeof(obj, className) { // QtObject, string -> bool
-        // className plus "(" is the class instance without modification
-        // className plus "_QML" is the class instance with user-defined properties
-        var str = obj.toString();
-        return str.startsWith(className + "(") || str.startsWith(className + "_QML");
-    }
-
    function navigateTo(url, objectType)
    {
        var existingItem = stackView.find(function(item, index) {
-            return qmltypeof(item, objectType)
+            return item instanceof objectType
        })

        if (existingItem !== null) {
@@ -275,7 +287,7 @@ ApplicationWindow {

            Label {
                id: versionLabel
-                visible: qmltypeof(stackView.currentItem, "SettingsView")
+                visible: stackView.currentItem instanceof SettingsView
                text: qsTr("Version %1").arg(SystemProperties.versionString)
                font.pointSize: 12
                horizontalAlignment: Qt.AlignRight
@@ -285,7 +297,7 @@ ApplicationWindow {
            NavigableToolButton {
                id: discordButton
                visible: SystemProperties.hasBrowser &&
-                         qmltypeof(stackView.currentItem, "SettingsView")
+                         stackView.currentItem instanceof SettingsView

                iconSource: "qrc:/res/discord.svg"

@@ -304,7 +316,7 @@ ApplicationWindow {

            NavigableToolButton {
                id: addPcButton
-                visible: qmltypeof(stackView.currentItem, "PcView")
+                visible: stackView.currentItem instanceof PcView

                iconSource:  "qrc:/res/ic_add_to_queue_white_48px.svg"

@@ -402,7 +414,7 @@ ApplicationWindow {

                iconSource: "qrc:/res/ic_videogame_asset_white_48px.svg"

-                onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", "GamepadMapper")
+                onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", GamepadMapper)

                Keys.onDownPressed: {
                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
@@ -414,7 +426,7 @@ ApplicationWindow {

                iconSource:  "qrc:/res/settings.svg"

-                onClicked: navigateTo("qrc:/gui/SettingsView.qml", "SettingsView")
+                onClicked: navigateTo("qrc:/gui/SettingsView.qml", SettingsView)

                Keys.onDownPressed: {
                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
@@ -37,7 +37,7 @@ void SdlGamepadKeyNavigation::enable()
    // arrival events. Additionally, there's a race condition between
    // our QML objects being destroyed and SDL being deinitialized that
    // this solves too.
-    if (SDLC_FAILURE(SDL_InitSubSystem(SDL_INIT_GAMEPAD))) {
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) != 0) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) failed: %s",
                     SDL_GetError());
@@ -51,19 +51,23 @@ void SdlGamepadKeyNavigation::enable()
    // on first init of the GC subsystem. We can't depend on them due to
    // overlapping lifetimes of SdlGamepadKeyNavigation instances, so we
    // will attach ourselves.
-    SDL_PumpEvents();
-    SDL_FlushEvent(SDL_EVENT_GAMEPAD_ADDED);
+    //
+    // NB: We use SDL_JoystickUpdate() instead of SDL_PumpEvents() because
+    // the latter can do a bit more work that we want (like handling video
+    // events that we intentionally do not want to process yet).
+    SDL_JoystickUpdate();
+    SDL_FlushEvent(SDL_CONTROLLERDEVICEADDED);

    // Open all currently attached game controllers
-    int numGamepads = 0;
-    SDL_JoystickID* gamepads = SDL_GetGamepads(&numGamepads);
-    for (int i = 0; i < numGamepads; i++) {
-        SDL_Gamepad * gc = SDL_OpenGamepad(i);
-        if (gc != nullptr) {
-            m_Gamepads.append(gc);
+    int numJoysticks = SDL_NumJoysticks();
+    for (int i = 0; i < numJoysticks; i++) {
+        if (SDL_IsGameController(i)) {
+            SDL_GameController* gc = SDL_GameControllerOpen(i);
+            if (gc != nullptr) {
+                m_Gamepads.append(gc);
+            }
        }
    }
-    SDL_free(gamepads);

    m_Enabled = true;

@@ -82,11 +86,11 @@ void SdlGamepadKeyNavigation::disable()
    Q_ASSERT(!m_PollingTimer->isActive());

    while (!m_Gamepads.isEmpty()) {
-        SDL_CloseGamepad(m_Gamepads[0]);
+        SDL_GameControllerClose(m_Gamepads[0]);
        m_Gamepads.removeAt(0);
    }

-    SDL_QuitSubSystem(SDL_INIT_GAMEPAD);
+    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
 }

 void SdlGamepadKeyNavigation::notifyWindowFocus(bool hasFocus)
@@ -99,51 +103,53 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
 {
    SDL_Event event;

+    // Update joystick state without pumping other events (see enable() comment)
+    SDL_JoystickUpdate();
+
    // Discard any pending button events on the first poll to avoid picking up
    // stale input data from the stream session (like the quit combo).
    if (m_FirstPoll) {
-        SDL_PumpEvents();
-        SDL_FlushEvent(SDL_EVENT_GAMEPAD_BUTTON_DOWN);
-        SDL_FlushEvent(SDL_EVENT_GAMEPAD_BUTTON_UP);
-
+        SDL_FlushEvent(SDL_CONTROLLERBUTTONDOWN);
+        SDL_FlushEvent(SDL_CONTROLLERBUTTONUP);
        m_FirstPoll = false;
    }

-    while (SDL_PollEvent(&event)) {
+    // Peep events rather than polling to avoid calling SDL_PumpEvents()
+    while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1) {
        switch (event.type) {
-        case SDL_EVENT_QUIT :
+        case SDL_QUIT:
            // SDL may send us a quit event since we initialize
            // the video subsystem on startup. If we get one,
            // forward it on for Qt to take care of.
            QCoreApplication::instance()->quit();
            break;
-        case SDL_EVENT_GAMEPAD_BUTTON_DOWN :
-        case SDL_EVENT_GAMEPAD_BUTTON_UP :
+        case SDL_CONTROLLERBUTTONDOWN:
+        case SDL_CONTROLLERBUTTONUP:
        {
            QEvent::Type type =
-                    event.type == SDL_EVENT_GAMEPAD_BUTTON_DOWN ?
+                    event.type == SDL_CONTROLLERBUTTONDOWN ?
                        QEvent::Type::KeyPress : QEvent::Type::KeyRelease;

            // Swap face buttons if needed
            if (m_Prefs->swapFaceButtons) {
-                switch (event.gbutton.button) {
-                case SDL_GAMEPAD_BUTTON_SOUTH :
-                    event.gbutton.button = SDL_GAMEPAD_BUTTON_EAST;
+                switch (event.cbutton.button) {
+                case SDL_CONTROLLER_BUTTON_A:
+                    event.cbutton.button = SDL_CONTROLLER_BUTTON_B;
                    break;
-                case SDL_GAMEPAD_BUTTON_EAST :
-                    event.gbutton.button = SDL_GAMEPAD_BUTTON_SOUTH;
+                case SDL_CONTROLLER_BUTTON_B:
+                    event.cbutton.button = SDL_CONTROLLER_BUTTON_A;
                    break;
-                case SDL_GAMEPAD_BUTTON_WEST :
-                    event.gbutton.button = SDL_GAMEPAD_BUTTON_NORTH;
+                case SDL_CONTROLLER_BUTTON_X:
+                    event.cbutton.button = SDL_CONTROLLER_BUTTON_Y;
                    break;
-                case SDL_GAMEPAD_BUTTON_NORTH :
-                    event.gbutton.button = SDL_GAMEPAD_BUTTON_WEST;
+                case SDL_CONTROLLER_BUTTON_Y:
+                    event.cbutton.button = SDL_CONTROLLER_BUTTON_X;
                    break;
                }
            }

-            switch (event.gbutton.button) {
-            case SDL_GAMEPAD_BUTTON_DPAD_UP :
+            switch (event.cbutton.button) {
+            case SDL_CONTROLLER_BUTTON_DPAD_UP:
                if (m_UiNavMode) {
                    // Back-tab
                    sendKey(type, Qt::Key_Tab, Qt::ShiftModifier);
@@ -152,7 +158,7 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                    sendKey(type, Qt::Key_Up);
                }
                break;
-            case SDL_GAMEPAD_BUTTON_DPAD_DOWN :
+            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
                if (m_UiNavMode) {
                    sendKey(type, Qt::Key_Tab);
                }
@@ -160,13 +166,13 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                    sendKey(type, Qt::Key_Down);
                }
                break;
-            case SDL_GAMEPAD_BUTTON_DPAD_LEFT :
+            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
                sendKey(type, Qt::Key_Left);
                break;
-            case SDL_GAMEPAD_BUTTON_DPAD_RIGHT :
+            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
                sendKey(type, Qt::Key_Right);
                break;
-            case SDL_GAMEPAD_BUTTON_SOUTH :
+            case SDL_CONTROLLER_BUTTON_A:
                if (m_UiNavMode) {
                    sendKey(type, Qt::Key_Space);
                }
@@ -174,14 +180,14 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                    sendKey(type, Qt::Key_Return);
                }
                break;
-            case SDL_GAMEPAD_BUTTON_EAST :
+            case SDL_CONTROLLER_BUTTON_B:
                sendKey(type, Qt::Key_Escape);
                break;
-            case SDL_GAMEPAD_BUTTON_WEST :
+            case SDL_CONTROLLER_BUTTON_X:
                sendKey(type, Qt::Key_Menu);
                break;
-            case SDL_GAMEPAD_BUTTON_NORTH :
-            case SDL_GAMEPAD_BUTTON_START :
+            case SDL_CONTROLLER_BUTTON_Y:
+            case SDL_CONTROLLER_BUTTON_START:
                // HACK: We use this keycode to inform main.qml
                // to show the settings when Key_Menu is handled
                // by the control in focus.
@@ -192,18 +198,11 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
            }
            break;
        }
-        case SDL_EVENT_GAMEPAD_ADDED :
-#if SDL_VERSION_ATLEAST(3, 0, 0)
-            SDL_Gamepad* gc = SDL_OpenGamepad(event.gdevice.which);
-            if (gc != nullptr) {
-                SDL_assert(!m_Gamepads.contains(gc));
-                m_Gamepads.append(gc);
-            }
-#else
-            SDL_Gamepad* gc = SDL_GameControllerOpen(event.cdevice.which);
+        case SDL_CONTROLLERDEVICEADDED:
+            SDL_GameController* gc = SDL_GameControllerOpen(event.cdevice.which);
            if (gc != nullptr) {
                // SDL_CONTROLLERDEVICEADDED can be reported multiple times for the same
-                // gamepad in rare cases, because SDL2 doesn't fixup the device index in
+                // gamepad in rare cases, because SDL doesn't fixup the device index in
                // the SDL_CONTROLLERDEVICEADDED event if an unopened gamepad disappears
                // before we've processed the add event.
                if (!m_Gamepads.contains(gc)) {
@@ -211,18 +210,17 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                }
                else {
                    // We already have this game controller open
-                    SDL_CloseGamepad(gc);
+                    SDL_GameControllerClose(gc);
                }
            }
-#endif
            break;
        }
    }

    // Handle analog sticks by polling
-    for (auto gc : m_Gamepads) {
-        short leftX = SDL_GetGamepadAxis(gc, SDL_GAMEPAD_AXIS_LEFTX);
-        short leftY = SDL_GetGamepadAxis(gc, SDL_GAMEPAD_AXIS_LEFTY);
+    for (auto gc : std::as_const(m_Gamepads)) {
+        short leftX = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_LEFTX);
+        short leftY = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_LEFTY);
        if (SDL_GetTicks() - m_LastAxisNavigationEventTime < AXIS_NAVIGATION_REPEAT_DELAY) {
            // Do nothing
        }
@@ -298,6 +296,12 @@ int SdlGamepadKeyNavigation::getConnectedGamepads()
    Q_ASSERT(m_Enabled);

    int count = 0;
-    SDL_free(SDL_GetGamepads(&count));
+    int numJoysticks = SDL_NumJoysticks();
+    for (int i = 0; i < numJoysticks; i++) {
+        if (SDL_IsGameController(i)) {
+            count++;
+        }
+    }
+
    return count;
 }
@@ -37,7 +37,7 @@ private slots:
 private:
    StreamingPreferences* m_Prefs;
    QTimer* m_PollingTimer;
-    QList<SDL_Gamepad*> m_Gamepads;
+    QList<SDL_GameController*> m_Gamepads;
    bool m_Enabled;
    bool m_UiNavMode;
    bool m_FirstPoll;
--- a/Show More
+++ b/Show More