Merge pull request #114 from yaser01/develop

Update 2.4.2
yaser01 · Jan 16, 2024 · cd14ff3 · cd14ff3
2 parents 6dc52d7 + 08bd45a
commit cd14ff3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/packages/Startup/Version.py b/packages/Startup/Version.py
@@ -1 +1 @@
-Version = "2.4"
+Version = "2.4.2"
diff --git a/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvmergeJob.py b/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvmergeJob.py
@@ -163,12 +163,12 @@ def generate_info_file(self):
             self.attachments_json_info.append(new_attachment_info)
 
     def setup_attachments_options(self):
+        discard_old = self.job.discard_old_attachments
+        if discard_old:
+            self.discard_old_attachments_command = add_json_line("--no-attachments")
         if len(self.job.attachments_absolute_path) > 0:
             allow_duplicates = self.job.allow_duplicates_attachments
-            discard_old = self.job.discard_old_attachments
             attachments_list_with_attach_command = []
-            if discard_old:
-                self.discard_old_attachments_command = add_json_line("--no-attachments")
             for file_to_attach in self.job.attachments_absolute_path:
                 file_name_to_attach = os.path.basename(file_to_attach)
                 if not discard_old and not allow_duplicates:

diff --git a/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvpropeditJob.py b/packages/Tabs/MuxSetting/Widgets/GetJsonForMkvpropeditJob.py
@@ -131,15 +131,15 @@ def generate_info_file(self):
             self.attachments_json_info.append(new_attachment_info)
 
     def setup_attachments_options(self):
-        if len(self.job.attachments_absolute_path)>0:
-            attachments_list_with_attach_command = []
-            discard_old_attachments_list_command = []
+        discard_old_attachments_list_command = []
+        attachments_list_with_attach_command = []
+        discard_old = self.job.discard_old_attachments
+        if discard_old:
+            for i in range(self.number_of_old_attachments + 2):
+                discard_old_attachments_list_command.append(add_json_line("--delete-attachment"))
+                discard_old_attachments_list_command.append(add_json_line(str(i)))
+        if len(self.job.attachments_absolute_path) > 0:
             allow_duplicates = self.job.allow_duplicates_attachments
-            discard_old = self.job.discard_old_attachments
-            if discard_old:
-                for i in range(self.number_of_old_attachments + 2):
-                    attachments_list_with_attach_command.append(add_json_line("--delete-attachment"))
-                    attachments_list_with_attach_command.append(add_json_line(str(i)))
             for file_to_attach in self.job.attachments_absolute_path:
                 file_name_to_attach = os.path.basename(file_to_attach)
                 if not discard_old and not allow_duplicates:
@@ -153,8 +153,8 @@ def setup_attachments_options(self):
                 attachments_list_with_attach_command.append(add_json_line("--add-attachment"))
                 attachments_list_with_attach_command.append(
                     add_json_line(check_for_system_backslash_path(file_to_attach)))
-            self.attachments_attach_command = "".join(attachments_list_with_attach_command)
-            self.discard_old_attachments_command = "".join(discard_old_attachments_list_command)
+        self.attachments_attach_command = "".join(attachments_list_with_attach_command)
+        self.discard_old_attachments_command = "".join(discard_old_attachments_list_command)
 
     def setup_chapter_options(self):
         if GlobalSetting.CHAPTER_ENABLED: