diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2020-12-04 08:50:31 +0100 |
|---|---|---|
| committer | Mikaël Capelle <capelle.mikael@gmail.com> | 2020-12-04 08:50:31 +0100 |
| commit | a30d49f4fc845164ef6bba4d2a834efce1dc01d7 (patch) | |
| tree | 5aa8becd18a2eae3795e602db0f499a864dab40f /src/organizerproxy.cpp | |
| parent | f229dbaaa7f516dc1958d0a0555b47cb17136377 (diff) | |
Avoid duplicating code to simulate startup.
Diffstat (limited to 'src/organizerproxy.cpp')
| -rw-r--r-- | src/organizerproxy.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index 1f73ee13..c41045e1 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -25,7 +25,14 @@ OrganizerProxy::OrganizerProxy(OrganizerCore* organizer, PluginContainer* plugin , m_PluginName(plugin->name())
, m_DownloadManagerProxy(std::make_unique<DownloadManagerProxy>(this, organizer->downloadManager()))
, m_ModListProxy(std::make_unique<ModListProxy>(this, organizer->modList()))
- , m_PluginListProxy(std::make_unique<PluginListProxy>(this, organizer->pluginList()))
+ , m_PluginListProxy(std::make_unique<PluginListProxy>(this, organizer->pluginList())) { }
+
+OrganizerProxy::~OrganizerProxy()
+{
+ disconnectSignals();
+}
+
+void OrganizerProxy::connectSignals()
{
m_Connections.push_back(m_Proxied->onAboutToRun(callSignalIfPluginActive(this, m_AboutToRun, true)));
m_Connections.push_back(m_Proxied->onFinishedRun(callSignalIfPluginActive(this, m_FinishedRun)));
@@ -39,14 +46,25 @@ OrganizerProxy::OrganizerProxy(OrganizerCore* organizer, PluginContainer* plugin m_Connections.push_back(m_Proxied->onPluginEnabled(callSignalAlways(m_PluginEnabled)));
m_Connections.push_back(m_Proxied->onPluginDisabled(callSignalAlways(m_PluginDisabled)));
+ // Connect the child proxies.
+ m_DownloadManagerProxy->connectSignals();
+ m_ModListProxy->connectSignals();
+ m_PluginListProxy->connectSignals();
}
-OrganizerProxy::~OrganizerProxy()
+void OrganizerProxy::disconnectSignals()
{
- log::debug("Deleting organizer proxy for plugin '{}'.", m_PluginName);
+ log::debug("Disconnecting organizer proxy for plugin '{}'.", m_PluginName);
+
+ // Disconnect the child proxies.
+ m_DownloadManagerProxy->disconnectSignals();
+ m_ModListProxy->disconnectSignals();
+ m_PluginListProxy->disconnectSignals();
+
for (auto& conn : m_Connections) {
conn.disconnect();
}
+ m_Connections.clear();
}
IModRepositoryBridge *OrganizerProxy::createNexusBridge() const
|