##// END OF EJS Templates
Merge pull request #6261 from blink1073/master...
Matthias Bussonnier -
r17552:9a0ef737 merge
parent child Browse files
Show More
@@ -892,6 +892,7 b' class MainWindow(QtGui.QMainWindow):'
892 title = self.window().windowTitle()
892 title = self.window().windowTitle()
893 cancel = QtGui.QMessageBox.Cancel
893 cancel = QtGui.QMessageBox.Cancel
894 okay = QtGui.QMessageBox.Ok
894 okay = QtGui.QMessageBox.Ok
895 accept_role = QtGui.QMessageBox.AcceptRole
895
896
896 if self.confirm_exit:
897 if self.confirm_exit:
897 if self.tab_widget.count() > 1:
898 if self.tab_widget.count() > 1:
@@ -917,7 +918,7 b' class MainWindow(QtGui.QMainWindow):'
917 if reply == cancel:
918 if reply == cancel:
918 event.ignore()
919 event.ignore()
919 return
920 return
920 if reply == okay:
921 if reply == okay or reply == accept_role:
921 while self.tab_widget.count() >= 1:
922 while self.tab_widget.count() >= 1:
922 # prevent further confirmations:
923 # prevent further confirmations:
923 widget = self.active_frontend
924 widget = self.active_frontend
General Comments 0
You need to be logged in to leave comments. Login now