From 2e37dafd7036973a315b525f131850a6fb6d0b35 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Tue, 11 Jul 2017 06:06:22 -0400
Subject: fixed various bugs

---
 src/preview_thread.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/preview_thread.py')

diff --git a/src/preview_thread.py b/src/preview_thread.py
index a72845b..fb3b792 100644
--- a/src/preview_thread.py
+++ b/src/preview_thread.py
@@ -25,8 +25,8 @@ class Worker(QtCore.QObject):
         self.parent = parent
         self.core = self.parent.core
         self.queue = queue
-        self.core.settings = parent.settings
-        self.stackedWidget = parent.window.stackedWidget
+        self.width = int(self.core.settings.value('outputWidth'))
+        self.height = int(self.core.settings.value('outputHeight'))
 
         # create checkerboard background to represent transparency
         self.background = FloodFrame(1920, 1080, (0, 0, 0, 0))
@@ -50,10 +50,10 @@ class Worker(QtCore.QObject):
                 except Empty:
                     continue
 
-            width = int(self.core.settings.value('outputWidth'))
-            height = int(self.core.settings.value('outputHeight'))
+            if self.background.width != self.width:
+                self.background = self.background.resize(
+                    (self.width, self.height))
             frame = self.background.copy()
-            frame = frame.resize((width, height))
 
             components = nextPreviewInformation["components"]
             for component in reversed(components):
@@ -63,23 +63,21 @@ class Worker(QtCore.QObject):
                     )
 
                 except ValueError as e:
+                    errMsg = "Bad frame returned by %s's preview renderer. " \
+                        "%s. This is a fatal error." % (
+                            str(component), str(e).capitalize()
+                        )
+                    print(errMsg)
                     self.parent.showMessage(
-                        msg="Bad frame returned by %s's previewRender method. "
-                            "This is a fatal error." %
-                            str(component),
+                        msg=errMsg,
                         detail=str(e),
                         icon='Warning',
                         parent=None  # MainWindow is in a different thread
                     )
-                    self.imageCreated.emit(
-                        QtGui.QImage(ImageQt(
-                            FloodFrame(width, height, (0, 0, 0, 0))
-                        ))
-                    )
                     self.error.emit()
                     break
             else:
-                self.imageCreated.emit(ImageQt(frame))
+                self.imageCreated.emit(QtGui.QImage(ImageQt(frame)))
 
         except Empty:
             True
-- 
cgit v1.2.3