3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.6'

Browse source
This commit is contained in:
Ghostkeeper 2020-04-02 17:21:03 +02:00
commit 4f50f42796
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
5 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/ImageReader/ImageReaderUI.py
View file

@ -92,13 +92,21 @@ class ImageReaderUI(QObject):
def onOkButtonClicked(self):
self._cancelled = False
self._ui_view.close()
self._ui_lock.release()
try:
self._ui_lock.release()
except RuntimeError:
# We don't really care if it was held or not. Just make sure it's not held now
pass
@pyqtSlot()
def onCancelButtonClicked(self):
self._cancelled = True
self._ui_view.close()
self._ui_lock.release()
try:
self._ui_lock.release()
except RuntimeError:
# We don't really care if it was held or not. Just make sure it's not held now
pass
@pyqtSlot(str)
def onWidthChanged(self, value):