Merge remote-tracking branch 'upstream/develop' into substance_integration

This commit is contained in:
Roy Nieterau 2023-03-23 14:36:44 +01:00
commit 94d851b243

View file

@ -439,7 +439,9 @@ class PublisherWindow(QtWidgets.QDialog):
event.accept()
return
if event.matches(ResetKeySequence):
if ResetKeySequence.matches(
QtGui.QKeySequence(event.key() | event.modifiers())
):
if not self.controller.publish_is_running:
self.reset()
event.accept()