1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00

Fix forgetting loaded plugins in portable mode

This commit is contained in:
David Rosca 2016-12-23 15:30:41 +01:00
parent 51130f4ed7
commit d68840a32b

View File

@ -95,7 +95,7 @@ void Plugins::loadSettings()
#endif #endif
QDir dir(DataPaths::path(DataPaths::Plugins)); QDir dir(DataPaths::path(DataPaths::Plugins));
for (int i = 0; i < m_allowedPlugins.count(); ++i) for (int i = 0; i < m_allowedPlugins.count(); ++i)
m_allowedPlugins[i] = dir.absoluteFilePath(m_allowedPlugins[i]); m_allowedPlugins[i] = dir.absoluteFilePath(QFileInfo(m_allowedPlugins[i]).fileName());
} }
c2f_loadSettings(); c2f_loadSettings();
@ -149,6 +149,7 @@ void Plugins::loadPlugins()
} }
Plugin plugin; Plugin plugin;
plugin.fileName = QFileInfo(fullPath).fileName();
plugin.fullPath = fullPath; plugin.fullPath = fullPath;
plugin.pluginLoader = loader; plugin.pluginLoader = loader;
plugin.instance = initPlugin(PluginInterface::StartupInitState, iPlugin, loader); plugin.instance = initPlugin(PluginInterface::StartupInitState, iPlugin, loader);