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

Merge branch 'fixes_june_2' into 'master'

Browse Source 
Fixes june 2 - missed change

See merge request openlp/openlp!211
This commit is contained in:
Tim Bentley 2020-06-21 07:17:35 +00:00
commit 14aa717272
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ from openlp.core.common.i18n import LanguageManager, UiStrings, translate
from openlp.core.common.mixins import LogMixin, RegistryProperties from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.path import create_paths from openlp.core.common.path import create_paths
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList from openlp.core.display.screens import ScreenList
from openlp.core.lib.plugin import PluginStatus from openlp.core.lib.plugin import PluginStatus
from openlp.core.lib.ui import create_action from openlp.core.lib.ui import create_action
@ -868,7 +869,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
create_paths(temp_dir_path) create_paths(temp_dir_path)
temp_config_path = temp_dir_path / import_file_path.name temp_config_path = temp_dir_path / import_file_path.name
shutil.copyfile(import_file_path, temp_config_path) shutil.copyfile(import_file_path, temp_config_path)
import_settings = QtCore.QSettings(str(temp_config_path), QtCore.QSettings.IniFormat) import_settings = Settings(str(temp_config_path), QtCore.QSettings.IniFormat)
self.log_info('hook upgrade_plugin_settings') self.log_info('hook upgrade_plugin_settings')
self.plugin_manager.hook_upgrade_plugin_settings(import_settings) self.plugin_manager.hook_upgrade_plugin_settings(import_settings)