From f9432b0fe812f77e22f9e6c4fff9205cd62bf5d3 Mon Sep 17 00:00:00 2001
From: k4yt3x <k4yt3x@k4yt3x.com>
Date: Sun, 24 Mar 2019 21:57:22 -0400
Subject: [PATCH] patch for potential problem with upscaler initialization

---
 bin/upscaler.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/upscaler.py b/bin/upscaler.py
index 03d4aaf..6162dc7 100644
--- a/bin/upscaler.py
+++ b/bin/upscaler.py
@@ -30,13 +30,12 @@ import time
 class Upscaler:
     """ An instance of this class is a upscaler that will
     upscale all images in the given folder.
-    
+
     Raises:
         Exception -- all exceptions
         ArgumentError -- if argument is not valid
     """
 
-
     def __init__(self, input_video, output_video, method, waifu2x_settings, ffmpeg_settings, waifu2x_driver='waifu2x_caffe', scale_width=False, scale_height=False, scale_ratio=False, model_dir=None, threads=5, video2x_cache_folder='{}\\video2x'.format(tempfile.gettempdir()), preserve_frames=False):
         # mandatory arguments
         self.input_video = input_video
@@ -152,7 +151,7 @@ class Upscaler:
             for image in [f for f in os.listdir(self.upscaled_frames) if os.path.isfile(os.path.join(self.upscaled_frames, f))]:
                 renamed = re.sub('_\[.*-.*\]\[x(\d+(\.\d+)?)\]\.png', '.png', image)
                 shutil.move('{}\\{}'.format(self.upscaled_frames, image), '{}\\{}'.format(self.upscaled_frames, renamed))
-            
+
             self.progress_bar_exit_signal = True
             progress_bar.join()
             return
@@ -197,9 +196,9 @@ class Upscaler:
         for thread_info in thread_pool:
             # create thread
             if self.scale_ratio:
-                thread = threading.Thread(target=w2.upscale, args=(thread_info[0], self.upscaled_frames, False, self.scale_width, self.scale_height))
-            else:
                 thread = threading.Thread(target=w2.upscale, args=(thread_info[0], self.upscaled_frames, self.scale_ratio, False, False))
+            else:
+                thread = threading.Thread(target=w2.upscale, args=(thread_info[0], self.upscaled_frames, False, self.scale_width, self.scale_height))
             thread.name = thread_info[1]
 
             # add threads into the pool
@@ -216,7 +215,7 @@ class Upscaler:
         # wait for threads to finish
         for thread in upscaler_threads:
             thread.join()
-        
+
         self.progress_bar_exit_signal = True
 
     def run(self):