Merge branch 'new-ddrescue-arguments' into dev

This commit is contained in:
2Shirt 2022-03-31 17:45:29 -06:00
commit 7325e00097
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -278,10 +278,13 @@ class BlockPair():
'trim': 'Pending', 'trim': 'Pending',
'scrape': 'Pending', 'scrape': 'Pending',
}) })
if 'DISPLAY' in os.environ or 'WAYLAND_DISPLAY' in os.environ: self.map_path.write_text(
# Enable opening ddrescueview during recovery data=DDRESCUE_MAP_TEMPLATE.format(
self.view_proc = None name=cfg.main.KIT_NAME_FULL,
self.map_path.touch() size=self.size,
),
encoding='utf-8',
)
# Set initial status # Set initial status
self.set_initial_status() self.set_initial_status()