diff --git a/tagstudio/src/core/library.py b/tagstudio/src/core/library.py index 442830d..ec89bae 100644 --- a/tagstudio/src/core/library.py +++ b/tagstudio/src/core/library.py @@ -1899,12 +1899,9 @@ class Library: source_tag_id: int = source_tag.id target_tag_id: int = target_tag.id - if not source_tag or not target_tag: - return 0 - if source_tag.name not in target_tag.aliases: target_tag.aliases.append(source_tag.name) - + for alias in source_tag.aliases: if alias not in target_tag.aliases: target_tag.aliases.append(alias) @@ -1912,7 +1909,7 @@ class Library: for subtag_id in source_tag.subtag_ids: if subtag_id not in target_tag.subtag_ids: target_tag.subtag_ids.append(subtag_id) - + for entry in self.entries: for field in entry.fields: if self.get_field_attr(field, "type") == "tag_box": diff --git a/tagstudio/src/qt/widgets/tag.py b/tagstudio/src/qt/widgets/tag.py index e6d1553..3511bbc 100644 --- a/tagstudio/src/qt/widgets/tag.py +++ b/tagstudio/src/qt/widgets/tag.py @@ -82,7 +82,6 @@ class TagWidget(QWidget): merge_tag_action.triggered.connect(self.show_merge_tag_modal) self.bg_button.addAction(merge_tag_action) - self.inner_layout = QHBoxLayout() self.inner_layout.setObjectName("innerLayout") self.inner_layout.setContentsMargins(2, 2, 2, 2)