raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

do some of the clean ups even when we just imported settings

Browse Source
This commit is contained in:
Andreas Preikschat 2012-05-27 12:58:10 +02:00
parent 612500c677
commit d5f1c54669
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openlp/core/ui/mainwindow.py
View File

@ -1185,22 +1185,23 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.imageManager.stop_manager = True self.imageManager.stop_manager = True
while self.imageManager.imageThread.isRunning(): while self.imageManager.imageThread.isRunning():
time.sleep(0.1) time.sleep(0.1)
# Clean temporary files used by services
self.serviceManagerContents.cleanUp()
if save_settings: if save_settings:
# Clean temporary files used by services
self.serviceManagerContents.cleanUp()
if QtCore.QSettings().value(u'advanced/save current plugin', if QtCore.QSettings().value(u'advanced/save current plugin',
QtCore.QVariant(False)).toBool(): QtCore.QVariant(False)).toBool():
QtCore.QSettings().setValue(u'advanced/current media plugin', QtCore.QSettings().setValue(u'advanced/current media plugin',
QtCore.QVariant(self.mediaToolBox.currentIndex())) QtCore.QVariant(self.mediaToolBox.currentIndex()))
# Call the cleanup method to shutdown plugins. # Call the cleanup method to shutdown plugins.
log.info(u'cleanup plugins') log.info(u'cleanup plugins')
self.pluginManager.finalise_plugins() self.pluginManager.finalise_plugins()
if save_settings:
# Save settings # Save settings
self.saveSettings() self.saveSettings()
# Close down the display # Close down the display
if self.liveController.display: if self.liveController.display:
self.liveController.display.close() self.liveController.display.close()
self.liveController.display = None self.liveController.display = None
def serviceChanged(self, reset=False, serviceName=None): def serviceChanged(self, reset=False, serviceName=None):
""" """