@@ -497,8 +497,8 @@ def error_with_blender(self, version=None, worker_message=None):
497
497
error_message = _ ("Error Output:\n {}" ).format (worker_message )
498
498
log .error ("Blender error: {}" .format (worker_message ))
499
499
500
- msg = QMessageBox ()
501
- msg . setText ( _ ("""
500
+ QMessageBox . critical ( self , error_message ,
501
+ _ ("""
502
502
Blender, the free open source 3D content creation suite, is required for this action. (http://www.blender.org)
503
503
504
504
Please check the preferences in OpenShot and be sure the Blender executable is correct.
@@ -509,10 +509,9 @@ def error_with_blender(self, version=None, worker_message=None):
509
509
{}""" ).format (info .BLENDER_MIN_VERSION ,
510
510
s .get ("blender_command" ),
511
511
error_message ))
512
- msg .exec_ ()
513
512
514
- # Enable the Render button again
515
- self .end_processing ()
513
+ # Close the blender interface
514
+ self .win . close ()
516
515
517
516
def inject_params (self , source_path , out_path , frame = None ):
518
517
# determine if this is 'preview' mode?
@@ -767,14 +766,12 @@ def blender_version_check(self):
767
766
self .process .kill ()
768
767
self .blender_error_nodata .emit ()
769
768
return False
770
- except subprocess . SubprocessError :
769
+ except Exception :
771
770
# Error running command. Most likely the blender executable path in
772
771
# the settings is incorrect, or is not a supported Blender version
772
+ log .error ("Version check exception" , exc_info = 1 )
773
773
self .blender_error_nodata .emit ()
774
774
return False
775
- except Exception :
776
- log .error ("Version check exception" , exc_info = 1 )
777
- return
778
775
779
776
ver_string = out .decode ('utf-8' )
780
777
log .debug ("Blender output:\n %s" , ver_string )
@@ -836,6 +833,7 @@ def Render(self):
836
833
_ = get_app ()._tr
837
834
838
835
if not self .version and not self .blender_version_check ():
836
+ self .finished .emit ()
839
837
return
840
838
841
839
self .command_output = ""
0 commit comments