From 15d70474d4df16cd03f4eb672d409166f793eabf Mon Sep 17 00:00:00 2001
From: tassaron
Date: Tue, 25 Jul 2017 22:02:47 -0400
Subject: error can be locked within properties()

and simplified the componenterrors again
---
 src/video_thread.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/video_thread.py')

diff --git a/src/video_thread.py b/src/video_thread.py
index 8cbe8a8..48f3729 100644
--- a/src/video_thread.py
+++ b/src/video_thread.py
@@ -163,24 +163,27 @@ class Worker(QtCore.QObject):
             except ComponentError:
                 pass
 
-            if 'error' in comp.properties():
+            compProps = comp.properties()
+            if 'error' in compProps or comp.error() is not None:
                 self.cancel()
                 self.canceled = True
                 canceledByComponent = True
                 compError = comp.error() \
                     if type(comp.error()) is tuple else (comp.error(), '')
                 errMsg = (
-                    "Component #%s encountered an error!" % compNo
+                    "Component #%s (%s) encountered an error!" % (
+                        str(compNo), comp.name
+                    )
                     if comp.error() is None else
                     'Export cancelled by component #%s (%s): %s' % (
                         str(compNo),
-                        str(comp),
+                        comp.name,
                         compError[0]
                     )
                 )
                 comp._error.emit(errMsg, compError[1])
                 break
-            if 'static' in comp.properties():
+            if 'static' in compProps:
                 self.staticComponents[compNo] = \
                     comp.frameRender(compNo, 0).copy()
 
-- 
cgit v1.2.3