Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
2Shirt 2023-06-17 20:14:25 -07:00
commit a3400d76f4
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -2111,7 +2111,10 @@ def run_ddrescue(state, block_pair, pass_name, settings, dry_run=True) -> None:
# Start ddrescue and ddrescueview (if enabled)
proc = exe.popen_program(cmd)
if block_pair.view_map and not block_pair.view_proc:
if (
block_pair.view_map
and (not block_pair.view_proc or block_pair.view_proc.poll() is not None)
):
block_pair.view_proc = exe.popen_program(
['ddrescueview', '-r', '5s', block_pair.map_path],
pipe=True,