Skip to content

Commit 6e50f1c

Browse files
authored
Blender: Always show error msg, close window after (#3790)
1 parent 4d6b05d commit 6e50f1c

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/windows/views/blender_listview.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ def error_with_blender(self, version=None, worker_message=None):
497497
error_message = _("Error Output:\n{}").format(worker_message)
498498
log.error("Blender error: {}".format(worker_message))
499499

500-
msg = QMessageBox()
501-
msg.setText(_("""
500+
QMessageBox.critical(self, error_message,
501+
_("""
502502
Blender, the free open source 3D content creation suite, is required for this action. (http://www.blender.org)
503503
504504
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):
509509
{}""").format(info.BLENDER_MIN_VERSION,
510510
s.get("blender_command"),
511511
error_message))
512-
msg.exec_()
513512

514-
# Enable the Render button again
515-
self.end_processing()
513+
# Close the blender interface
514+
self.win.close()
516515

517516
def inject_params(self, source_path, out_path, frame=None):
518517
# determine if this is 'preview' mode?
@@ -767,14 +766,12 @@ def blender_version_check(self):
767766
self.process.kill()
768767
self.blender_error_nodata.emit()
769768
return False
770-
except subprocess.SubprocessError:
769+
except Exception:
771770
# Error running command. Most likely the blender executable path in
772771
# the settings is incorrect, or is not a supported Blender version
772+
log.error("Version check exception", exc_info=1)
773773
self.blender_error_nodata.emit()
774774
return False
775-
except Exception:
776-
log.error("Version check exception", exc_info=1)
777-
return
778775

779776
ver_string = out.decode('utf-8')
780777
log.debug("Blender output:\n%s", ver_string)
@@ -836,6 +833,7 @@ def Render(self):
836833
_ = get_app()._tr
837834

838835
if not self.version and not self.blender_version_check():
836+
self.finished.emit()
839837
return
840838

841839
self.command_output = ""

0 commit comments

Comments
 (0)