forked from openlp/openlp
do some of the clean ups even when we just imported settings
This commit is contained in:
parent
612500c677
commit
d5f1c54669
@ -1185,9 +1185,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||
self.imageManager.stop_manager = True
|
||||
while self.imageManager.imageThread.isRunning():
|
||||
time.sleep(0.1)
|
||||
if save_settings:
|
||||
# Clean temporary files used by services
|
||||
self.serviceManagerContents.cleanUp()
|
||||
if save_settings:
|
||||
if QtCore.QSettings().value(u'advanced/save current plugin',
|
||||
QtCore.QVariant(False)).toBool():
|
||||
QtCore.QSettings().setValue(u'advanced/current media plugin',
|
||||
@ -1195,6 +1195,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||
# Call the cleanup method to shutdown plugins.
|
||||
log.info(u'cleanup plugins')
|
||||
self.pluginManager.finalise_plugins()
|
||||
if save_settings:
|
||||
# Save settings
|
||||
self.saveSettings()
|
||||
# Close down the display
|
||||
|
Loading…
Reference in New Issue
Block a user