mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #6602: FIX(plugins): Unset active positional plugin on unloading it

Browse Source
This commit is contained in:
Robert Adam 2025-01-11 20:55:23 +01:00 committed by GitHub
commit 7699d71827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mumble/PluginManager.cpp
View File

@ -176,7 +176,7 @@ bool PluginManager::eventFilter(QObject *target, QEvent *event) {
return QObject::eventFilter(target, event);
}
void PluginManager::unloadPlugins() const {
void PluginManager::unloadPlugins() {
QReadLocker lock(&m_pluginCollectionLock);
auto it = m_pluginHashMap.begin();
@ -538,7 +538,7 @@ bool PluginManager::loadPlugin(plugin_id_t pluginID) const {
return false;
}
void PluginManager::unloadPlugin(plugin_id_t pluginID) const {
void PluginManager::unloadPlugin(plugin_id_t pluginID) {
plugin_ptr_t plugin;
{
QReadLocker lock(&m_pluginCollectionLock);
@ -551,9 +551,20 @@ void PluginManager::unloadPlugin(plugin_id_t pluginID) const {
}
}
void PluginManager::unloadPlugin(Plugin &plugin) const {
void PluginManager::unloadPlugin(Plugin &plugin) {
if (plugin.isLoaded()) {
// Only shut down loaded plugins
bool isActivePosDataPlugin = false;
{
QWriteLocker lock(&m_activePosDataPluginLock);
isActivePosDataPlugin = &plugin == m_activePositionalDataPlugin.get();
}
if (isActivePosDataPlugin) {
unlinkPositionalData();
}
plugin.shutdown();
}
}
@ -996,7 +1007,9 @@ void PluginManager::reportLostLink(mumble_plugin_id_t pluginID) {
const_plugin_ptr_t plugin = getPlugin(pluginID);
if (plugin) {
// Need to check for the presence of Global::get().l in case we are currently
// shutting down Mumble in which case the Log might already have been deleted.
if (plugin && Global::get().l) {
Global::get().l->log(Log::Information,
PluginManager::tr("%1 lost link").arg(plugin->getName().toHtmlEscaped()));
}

6
src/mumble/PluginManager.h
View File

@ -85,7 +85,7 @@ protected:
bool eventFilter(QObject *target, QEvent *event) Q_DECL_OVERRIDE;
/// Unloads all plugins that are currently loaded.
void unloadPlugins() const;
void unloadPlugins();
/// Clears the current list of plugins
void clearPlugins();
/// Iterates over the plugins and tries to select a plugin that currently claims to be able to deliver positional
@ -145,11 +145,11 @@ public:
/// Unloads the plugin with the given ID. Unloading means shutting the plugign down.
///
/// @param pluginID The ID of the plugin to unload
void unloadPlugin(plugin_id_t pluginID) const;
void unloadPlugin(plugin_id_t pluginID);
/// Unloads the given plugin. Unloading means shutting the plugign down.
///
/// @param plugin The plugin to unload
void unloadPlugin(Plugin &plugin) const;
void unloadPlugin(Plugin &plugin);
/// Clears the plugin from the list of known plugins
///
/// @param pluginID The ID of the plugin to forget about