Version 4.2.2 (#223)

* Fixing output_directory config option not highest priority (thanks to cwills75)
cdgriffith · May 12, 2021 · ee48d7b · ee48d7b
1 parent 1ed0a16
commit ee48d7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 4.2.2
+
+* Fixing output_directory not highest priority (thanks to cwills75)
+
 ## Version 4.2.1
 
 * Adding support for source_directory and output_name_format in config file (thanks to cwills75)

diff --git a/fastflix/version.py b/fastflix/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "4.2.1"
+__version__ = "4.2.2"
 __author__ = "Chris Griffith"
diff --git a/fastflix/widgets/main.py b/fastflix/widgets/main.py
@@ -854,10 +854,10 @@ def generate_output_filename(self):
         rand_8 = secrets.token_hex(4)
         ext = self.current_encoder.video_extension
         out_loc = f"{Path('~').expanduser()}{os.sep}"
-        if self.app.fastflix.config.output_directory:
-            out_loc = f"{self.app.fastflix.config.output_directory}{os.sep}"
         if self.input_video:
             out_loc = f"{self.input_video.parent}{os.sep}"
+        if self.app.fastflix.config.output_directory:
+            out_loc = f"{self.app.fastflix.config.output_directory}{os.sep}"
 
         gen_string = self.app.fastflix.config.output_name_format or "{source}-fastflix-{rand_4}.{ext}"