Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the Diff and Compare dialogs constructor causing an unexpected exception.
Sun, 24 Mar 2024 11:46:47 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 24 Mar 2024 11:46:47 +0100
- branch
- eric7
- changeset 10644
- e56175bfead8
- parent 10643
- 08682797bfcd
- child 10645
- 2a28bb2961b8
Fixed an issue in the Diff and Compare dialogs constructor causing an unexpected exception.
| src/eric7/UI/CompareDialog.py | file | annotate | diff | comparison | revisions | |
| src/eric7/UI/DiffDialog.py | file | annotate | diff | comparison | revisions |
--- a/src/eric7/UI/CompareDialog.py Tue Mar 19 16:36:16 2024 +0100 +++ b/src/eric7/UI/CompareDialog.py Sun Mar 24 11:46:47 2024 +0100 @@ -164,7 +164,7 @@ self.markerPattern = r"\0\+|\0\^|\0\-" - if len(files) == 2: + if bool(files) and len(files) == 2: self.filesGroup.hide() self.file1Picker.setText(files[0][1]) self.file2Picker.setText(files[1][1])
--- a/src/eric7/UI/DiffDialog.py Tue Mar 19 16:36:16 2024 +0100 +++ b/src/eric7/UI/DiffDialog.py Sun Mar 24 11:46:47 2024 +0100 @@ -78,7 +78,7 @@ self.file1Picker.textChanged.connect(self.__fileChanged) self.file2Picker.textChanged.connect(self.__fileChanged) - if len(files) == 2: + if bool(files) and len(files) == 2: self.file1Picker.setText(files[0]) self.file2Picker.setText(files[1]) QTimer.singleShot(0, self.on_diffButton_clicked)
