Skip to content

Commit a8dcbff

Browse files
madic-createsbuhtz
andauthored
fix(gui): Crash comparing backups using diff feature
Bug was introduced with 5506854 and released in 1.5.5 and 1.5.6. --------- Co-authored-by: Christian Buhtz <c.buhtz@posteo.jp>
1 parent 1902496 commit a8dcbff

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Version 1.6.0-dev (development of upcoming release)
5151
* Removed: UI translation in Bosnian, Thai, and Occidental/Interlingue (#1914)
5252
* Removed: LICENSE file in favor of LICENSES directory and LICENSES.md file
5353
* Removed: SSH Cipher configuration in Manage profiles dialog (#2143)
54+
* Fixed: Crash in Compare snapshots dialog (aka Snapshots dialog) whhen comparing/diff two backups (#2327 Michael Neese @madic-creates)
5455
* Fixed: Enforce UTF-8 encoding in takesnapshot.log and some other files (#2298)
5556
* Fixed: Attribute error about missing 'cbCopyUnsafeLinks' (#2279)
5657
* Fixed: Use LC_ALL instead of LC_TIME to set the locale

qt/snapshotsdialog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def timeLineExecute(self, _item, _column):
373373
# prevent backup data from being accidentally overwritten
374374
# by create a temporary local copy and only open that one
375375
if not isinstance(self.sid, snapshots.RootSnapshot):
376-
full_path = self.parent.tmpCopy(full_path, sid)
376+
full_path = self.parent._create_temporary_copy(full_path, sid)
377377

378378
QDesktopServices.openUrl(QUrl(full_path))
379379

@@ -400,9 +400,9 @@ def btnDiffClicked(self):
400400
# prevent backup data from being accidentally overwritten
401401
# by create a temporary local copy and only open that one
402402
if not isinstance(sid1, snapshots.RootSnapshot):
403-
path1 = self.parent.tmpCopy(path1, sid1)
403+
path1 = self.parent._create_temporary_copy(path1, sid1)
404404
if not isinstance(sid2, snapshots.RootSnapshot):
405-
path2 = self.parent.tmpCopy(path2, sid2)
405+
path2 = self.parent._create_temporary_copy(path2, sid2)
406406

407407
params = diffParams
408408
params = params.replace('%1', '"%s"' % path1)

0 commit comments

Comments
 (0)