trcc-linux 8.7.2__tar.gz → 8.7.4__tar.gz

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 8.7.2
+Version: 8.7.4
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme
@@ -127,13 +127,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.4-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.2-1_all.deb
-sudo dpkg -i trcc-linux_8.7.2-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.4-1_all.deb
+sudo dpkg -i trcc-linux_8.7.4-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -141,8 +141,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.7.2-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.4-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.7.4-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -169,8 +169,8 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 | OS | Download | Notes |
 |----|----------|-------|
-| **Windows 10/11** | [`trcc-8.7.2-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
-| **macOS 11+** | [`trcc-8.7.2-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
+| **Windows 10/11** | [`trcc-8.7.4-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
+| **macOS 11+** | [`trcc-8.7.4-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
 | **FreeBSD** | `pip install trcc-linux` | PyPI only, needs `libusb` + `py311-pyusb` |
 
 See the **[Install Guide](doc/GUIDE_INSTALL.md)** for detailed setup instructions, requirements, and troubleshooting for each platform.

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/README.md

@@ -60,13 +60,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.4-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.2-1_all.deb
-sudo dpkg -i trcc-linux_8.7.2-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.4-1_all.deb
+sudo dpkg -i trcc-linux_8.7.4-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -74,8 +74,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.7.2-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.4-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.7.4-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -102,8 +102,8 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 | OS | Download | Notes |
 |----|----------|-------|
-| **Windows 10/11** | [`trcc-8.7.2-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
-| **macOS 11+** | [`trcc-8.7.2-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
+| **Windows 10/11** | [`trcc-8.7.4-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
+| **macOS 11+** | [`trcc-8.7.4-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
 | **FreeBSD** | `pip install trcc-linux` | PyPI only, needs `libusb` + `py311-pyusb` |
 
 See the **[Install Guide](doc/GUIDE_INSTALL.md)** for detailed setup instructions, requirements, and troubleshooting for each platform.

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "8.7.2"
+version = "8.7.4"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/__version__.py

@@ -1,4 +1,4 @@
 """TRCC Linux version information. History in doc/CHANGELOG.md."""
 
-__version__ = "8.7.2"
+__version__ = "8.7.4"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/adapters/device/factory.py

@@ -359,48 +359,33 @@ class WindowsScsiProtocol(DeviceProtocol):
         return self._transport
 
     def _do_handshake(self) -> Optional[HandshakeResult]:
-        """Poll Windows SCSI device to discover FBL → resolution."""
+        """Init Windows SCSI device and determine FBL.
+
+        Windows IOCTL_SCSI_PASS_THROUGH_DIRECT read direction times out
+        (error 121) on USB mass storage LCD devices — the protocol doesn't
+        map cleanly to standard SCSI IN/OUT. Skip the poll read and default
+        to FBL=100 (320x320). The init write still works and is required
+        to wake the device for frame sends.
+        """
         import time  # noqa: I001
 
-        from .scsi import (
-            ScsiDevice,
-            _BOOT_MAX_RETRIES,
-            _BOOT_SIGNATURE,
-            _BOOT_WAIT_SECONDS,
-            _POST_INIT_DELAY,
-        )
+        from .scsi import ScsiDevice, _POST_INIT_DELAY
 
         transport = self._get_transport()
         if transport is None:
             return None
 
         try:
-            poll_header = ScsiDevice._build_header(0xF5, 0xE100)
-            cdb = poll_header[:16]
-
-            # Poll with boot state check
-            response = b''
-            for attempt in range(_BOOT_MAX_RETRIES):
-                response = transport.read_cdb(cdb, 0xE100, timeout=15)
-                if len(response) >= 8 and response[4:8] == _BOOT_SIGNATURE:
-                    log.info("Device %s still booting (attempt %d/%d)",
-                             self._path, attempt + 1, _BOOT_MAX_RETRIES)
-                    time.sleep(_BOOT_WAIT_SECONDS)
-                elif response:
-                    break
-                else:
-                    log.warning("Windows SCSI poll returned empty, "
-                                "defaulting FBL=100")
-                    break
-
-            fbl = response[0] if response else 100
-            log.debug("Windows SCSI poll byte[0] = %d (FBL)", fbl)
-
-            # Init
+            # Init write — wakes the device for frame reception
             init_header = ScsiDevice._build_header(0x1F5, 0xE100)
             transport.send_cdb(init_header[:16], b'\x00' * 0xE100)
             time.sleep(_POST_INIT_DELAY)
 
+            # Default FBL=100 (320x320) — poll read not supported on
+            # Windows SCSI passthrough for these devices
+            fbl = 100
+            log.info("Windows SCSI init OK, defaulting FBL=%d", fbl)
+
             # Build HandshakeResult
             from trcc.core.models import fbl_to_resolution
             width, height = fbl_to_resolution(fbl)
@@ -410,7 +395,7 @@ class WindowsScsiProtocol(DeviceProtocol):
                 resolution=(width, height),
                 pm_byte=fbl,
                 sub_byte=0,
-                raw_response=response[:64],
+                raw_response=b'',
             )
         except Exception:
             log.exception("Windows SCSI handshake failed on %s", self._path)

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/adapters/infra/debug_report.py

@@ -384,10 +384,10 @@ class DebugReport:
             sec.lines.append("    (device in use by trcc gui)")
 
     def _handshake_scsi(self, dev, sec: _Section) -> None:
-        from trcc.adapters.device.factory import ScsiProtocol
+        from trcc.adapters.device.factory import DeviceProtocolFactory
         from trcc.core.models import FBL_TO_RESOLUTION
 
-        protocol = ScsiProtocol(dev.scsi_device)
+        protocol = DeviceProtocolFactory.create_protocol(dev)
         try:
             result = protocol.handshake()
             if result is None:

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/cli/_device.py

@@ -102,11 +102,11 @@ def _probe(dev):
         except Exception:
             pass
 
-    # Bulk USB devices: probe via BulkProtocol
+    # Bulk USB devices: probe via factory
     elif dev.implementation == 'bulk_usblcdnew':
         try:
-            from trcc.adapters.device.factory import BulkProtocol
-            bp = BulkProtocol(dev.vid, dev.pid)
+            from trcc.adapters.device.factory import DeviceProtocolFactory
+            bp = DeviceProtocolFactory.create_protocol(dev)
             hs = bp.handshake()
             if hs and hs.resolution:
                 result['resolution'] = hs.resolution

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/core/lcd_device.py

@@ -326,6 +326,7 @@ class LCDDevice(Device):
             ovl.enabled = True
             # Track mask source for theme save
             self._display_svc._mask_source_dir = p if p.is_dir() else p.parent
+            log.debug("load_mask_standalone: _mask_source_dir=%s", self._display_svc._mask_source_dir)
             # Use current theme bg, fall back to black
             bg = self._display_svc._clean_background or \
                 self._display_svc.current_image or \

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/qt_components/trcc_app.py

@@ -1895,11 +1895,15 @@ class TRCCApp(QMainWindow):
         event.accept()
 
     def closeEvent(self, event):
+        from trcc.core.platform import WINDOWS
         if (not self._force_quit
                 and self._tray.isSystemTrayAvailable()
                 and self._tray.isVisible()):
             event.ignore()
-            self.hide()
+            if WINDOWS:
+                self.showMinimized()
+            else:
+                self.hide()
             return
 
         # Full quit
@@ -1915,6 +1919,9 @@ class TRCCApp(QMainWindow):
             self._lcd_handler.cleanup()
         if self._ipc_server:
             self._ipc_server.shutdown()
+        # Release USB device handles so the device can be reopened
+        from ..adapters.device.factory import DeviceProtocolFactory
+        DeviceProtocolFactory.close_all()
         TRCCApp._instance = None
         event.accept()
         app = QApplication.instance()

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/services/display.py

@@ -212,6 +212,7 @@ class DisplayService:
         # Wire up state from loader result
         self._mask_source_dir = result.get('mask_source_dir')
         self.current_theme_path = result.get('theme_path')
+        log.debug("load_local_theme: _mask_source_dir=%s", self._mask_source_dir)
 
         # Set current_image from result or from video first frame
         if result.get('image'):
@@ -239,8 +240,11 @@ class DisplayService:
         result = self._loader.load_cloud_theme(theme, self.working_dir)
         log.debug("load_cloud_theme: loader result keys=%s", list(result.keys()))
 
-        # Wire up state from loader result
-        self._mask_source_dir = result.get('mask_source_dir')
+        # Wire up state — cloud themes are video-only, so preserve
+        # existing mask source dir (user may have applied a mask before
+        # selecting the cloud video background)
+        if result.get('mask_source_dir') is not None:
+            self._mask_source_dir = result['mask_source_dir']
         self.current_theme_path = result.get('theme_path')
 
         # Convert PIL frames → native renderer surfaces
@@ -274,6 +278,7 @@ class DisplayService:
 
         self._mask_source_dir = self._loader.apply_mask(
             mask_dir, self.working_dir, self.lcd_size)
+        log.debug("apply_mask: _mask_source_dir=%s", self._mask_source_dir)
 
         # Invalidate pre-baked video cache (old mask baked in)
         self._cache = None

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/services/theme.py

@@ -355,8 +355,19 @@ class ThemeService:
 
             # Determine mask source path
             mask_path_str = None
+            log.debug(
+                "ThemeService.save: mask=%s (type=%s), mask_source=%s, "
+                "mask_source exists=%s",
+                bool(mask), type(mask).__name__,
+                mask_source,
+                mask_source.exists() if mask_source else 'N/A',
+            )
             if mask and mask_source:
                 mask_file = ThemeDir(mask_source).mask
+                log.debug(
+                    "ThemeService.save: mask_file=%s, exists=%s",
+                    mask_file, mask_file.exists(),
+                )
                 if mask_file.exists():
                     mask_path_str = str(mask_source)
 

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/src/trcc/services/theme_persistence.py

@@ -42,6 +42,15 @@ class ThemePersistence:
         mask_img, mask_pos = overlay.get_mask()
         overlay_config = overlay.config
 
+        log.debug(
+            "ThemePersistence.save: mask_source_dir=%s, mask_img=%s (type=%s), "
+            "mask_pos=%s, overlay_config keys=%s",
+            mask_source_dir,
+            bool(mask_img), type(mask_img).__name__,
+            mask_pos,
+            list(overlay_config.keys()) if overlay_config else None,
+        )
+
         return ThemeService.save(
             name, data_dir, lcd_size,
             background=current_image,

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/tests/adapters/infra/test_debug_report.py

@@ -478,15 +478,15 @@ class TestHandshakeScsi:
         dev.scsi_device = "/dev/sg0"
         return dev
 
-    @patch("trcc.adapters.device.factory.ScsiProtocol")
-    def test_success_known_fbl(self, MockScsi):
+    @patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol")
+    def test_success_known_fbl(self, mock_create):
         result = MagicMock()
         result.model_id = 50  # FBL 50 → known
         result.resolution = (320, 240)
         result.raw_response = bytes(range(64))
         proto = MagicMock()
         proto.handshake.return_value = result
-        MockScsi.return_value = proto
+        mock_create.return_value = proto
 
         sec_obj = MagicMock()
         sec_obj.lines = []
@@ -499,15 +499,15 @@ class TestHandshakeScsi:
         assert "320" in text
         proto.close.assert_called_once()
 
-    @patch("trcc.adapters.device.factory.ScsiProtocol")
-    def test_success_unknown_fbl(self, MockScsi):
+    @patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol")
+    def test_success_unknown_fbl(self, mock_create):
         result = MagicMock()
         result.model_id = 999  # not in table
         result.resolution = (0, 0)
         result.raw_response = b""
         proto = MagicMock()
         proto.handshake.return_value = result
-        MockScsi.return_value = proto
+        mock_create.return_value = proto
 
         sec_obj = MagicMock()
         sec_obj.lines = []
@@ -518,11 +518,11 @@ class TestHandshakeScsi:
         assert "UNKNOWN" in text
         assert "FBL=999" in text
 
-    @patch("trcc.adapters.device.factory.ScsiProtocol")
-    def test_handshake_returns_none(self, MockScsi):
+    @patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol")
+    def test_handshake_returns_none(self, mock_create):
         proto = MagicMock()
         proto.handshake.return_value = None
-        MockScsi.return_value = proto
+        mock_create.return_value = proto
 
         sec_obj = MagicMock()
         sec_obj.lines = []
@@ -533,11 +533,11 @@ class TestHandshakeScsi:
         assert "poll failed" in text
         proto.close.assert_called_once()
 
-    @patch("trcc.adapters.device.factory.ScsiProtocol")
-    def test_close_called_on_exception(self, MockScsi):
+    @patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol")
+    def test_close_called_on_exception(self, mock_create):
         proto = MagicMock()
         proto.handshake.side_effect = RuntimeError("device gone")
-        MockScsi.return_value = proto
+        mock_create.return_value = proto
 
         sec_obj = MagicMock()
         sec_obj.lines = []

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/tests/cli/test_device.py

@@ -555,7 +555,7 @@ class TestProbe:
     # -- bulk_usblcdnew ---
 
     def test_bulk_success(self):
-        """bulk_usblcdnew: BulkProtocol handshake parsed for resolution and pm."""
+        """bulk_usblcdnew: factory handshake parsed for resolution and pm."""
         dev = _make_detected_device(implementation="bulk_usblcdnew")
 
         hs = MagicMock()
@@ -565,7 +565,8 @@ class TestProbe:
         mock_bp = MagicMock()
         mock_bp.handshake.return_value = hs
 
-        with patch("trcc.adapters.device.factory.BulkProtocol", return_value=mock_bp):
+        with patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol",
+                   return_value=mock_bp):
             result = _probe(dev)
 
         assert result["resolution"] == (480, 480)
@@ -579,7 +580,8 @@ class TestProbe:
         mock_bp = MagicMock()
         mock_bp.handshake.return_value = None
 
-        with patch("trcc.adapters.device.factory.BulkProtocol", return_value=mock_bp):
+        with patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol",
+                   return_value=mock_bp):
             result = _probe(dev)
 
         assert result == {}
@@ -589,7 +591,7 @@ class TestProbe:
         """bulk_usblcdnew: exception in handshake is swallowed."""
         dev = _make_detected_device(implementation="bulk_usblcdnew")
 
-        with patch("trcc.adapters.device.factory.BulkProtocol",
+        with patch("trcc.adapters.device.factory.DeviceProtocolFactory.create_protocol",
                    side_effect=RuntimeError("bulk error")):
             result = _probe(dev)
 

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/tests/services/test_display_integration.py

@@ -331,17 +331,18 @@ class TestThemeSaveRoundTrip:
             (save_dir / 'theme320320' / 'Custom_MaskSave' / 'config.json').read_text())
         assert config['mask'] == str(mask_dir)
 
-    def test_save_after_cloud_load_no_stale_mask(
+    def test_cloud_load_preserves_mask_source_dir(
         self, display_svc: DisplayService, renderer: Any,
         mock_settings: Any, mock_media: MagicMock, tmp_path: Path,
     ) -> None:
-        """Cloud load must clear mask, so save has no stale mask ref."""
-        # Set up stale mask state
-        display_svc._mask_source_dir = Path('/old/stale/mask')
+        """Cloud load must preserve mask source dir (video-only background)."""
+        # User applied a mask before loading cloud video
+        mask_dir = Path('/applied/mask/dir')
+        display_svc._mask_source_dir = mask_dir
         display_svc.current_image = renderer.create_surface(320, 320, (0, 0, 0))
         display_svc._clean_background = display_svc.current_image
 
-        # Simulate cloud theme load
+        # Cloud theme load — video only, no mask of its own
         frame = renderer.create_surface(320, 320, (50, 50, 50))
         mock_media.get_frame.return_value = frame
         mock_media.has_frames = True
@@ -353,12 +354,13 @@ class TestThemeSaveRoundTrip:
         with patch.object(display_svc._loader, 'load_cloud_theme', return_value=cloud_result):
             display_svc.load_cloud_theme(MagicMock())
 
-        assert display_svc._mask_source_dir is None
+        # Mask source dir preserved — not wiped by cloud load
+        assert display_svc._mask_source_dir == mask_dir
 
-        # Save should NOT reference old mask
+        # Save should reference the mask
         with patch.object(ThemePersistence, 'save', return_value=(True, 'ok')) as mock_save:
             display_svc.save_theme('CloudSave', tmp_path)
-        assert mock_save.call_args.kwargs.get('mask_source_dir') is None
+        assert mock_save.call_args.kwargs.get('mask_source_dir') == mask_dir
 
     def test_save_after_brightness_uses_clean_bg(
         self, display_svc: DisplayService, renderer: Any,

{trcc_linux-8.7.2 → trcc_linux-8.7.4}/tests/services/test_theme_persistence.py

@@ -263,11 +263,12 @@ class TestLoadMaskStandaloneWiring:
 
 class TestCloudThemeStateWiring:
 
-    def test_clears_stale_mask_source_dir(
+    def test_preserves_mask_source_dir_on_cloud_load(
         self, display_svc: DisplayService, mock_settings: Any,
     ) -> None:
-        """Loading a cloud theme must clear _mask_source_dir from previous theme."""
-        display_svc._mask_source_dir = Path('/old/mask')
+        """Cloud load (video-only) must preserve existing mask source dir."""
+        mask_dir = Path('/applied/mask')
+        display_svc._mask_source_dir = mask_dir
 
         cloud_result = {
             'image': None, 'is_animated': True,
@@ -278,7 +279,7 @@ class TestCloudThemeStateWiring:
         with patch.object(display_svc._loader, 'load_cloud_theme', return_value=cloud_result):
             display_svc.load_cloud_theme(MagicMock())
 
-        assert display_svc._mask_source_dir is None
+        assert display_svc._mask_source_dir == mask_dir
 
     def test_wires_theme_path(
         self, display_svc: DisplayService, mock_settings: Any,
@@ -314,11 +315,12 @@ class TestCloudThemeStateWiring:
 
         assert display_svc._clean_background is frame
 
-    def test_save_after_cloud_load_no_stale_mask(
+    def test_save_after_cloud_load_preserves_mask(
         self, display_svc: DisplayService, tmp_path: Path, mock_settings: Any,
     ) -> None:
-        """Save after cloud load must NOT reference old mask."""
-        display_svc._mask_source_dir = Path('/old/mask')
+        """Save after cloud load must preserve applied mask source dir."""
+        mask_dir = Path('/applied/mask')
+        display_svc._mask_source_dir = mask_dir
         display_svc.media.get_frame.return_value = make_test_surface(320, 320, (50, 50, 50))
 
         cloud_result = {
@@ -333,4 +335,4 @@ class TestCloudThemeStateWiring:
         with patch.object(ThemePersistence, 'save', return_value=(True, 'ok')) as mock_save:
             display_svc.save_theme('CloudSave', tmp_path)
 
-        assert mock_save.call_args.kwargs.get('mask_source_dir') is None
+        assert mock_save.call_args.kwargs.get('mask_source_dir') == mask_dir