[addons] Reset addon settings when destroying the addon instance.

johnrvt · Dec 21, 2020 · 347f757 · 347f757
1 parent d02291e
commit 347f757
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
@@ -125,6 +125,11 @@ bool CAddon::ReloadSettings()
  return LoadSettings(true);
 }
 
+void CAddon::ResetSettings()
+{
+ m_settings.reset();
+}
+
 bool CAddon::LoadUserSettings()
 {
  if (!SettingsInitialized())

diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
@@ -242,6 +242,8 @@ class CAddon : public IAddon
  }
  bool ReloadSettings() override;
 
+ void ResetSettings() override;
+
  /*! \brief retrieve the running instance of an add-on if it persists while running.
  */
  AddonPtr GetRunningInstance() const override { return AddonPtr(); }

diff --git a/xbmc/addons/IAddon.h b/xbmc/addons/IAddon.h
@@ -82,6 +82,7 @@ namespace ADDON
  virtual bool MeetsVersion(const AddonVersion& versionMin,
  const AddonVersion& version) const = 0;
  virtual bool ReloadSettings() =0;
+ virtual void ResetSettings() = 0;
  virtual AddonPtr GetRunningInstance() const=0;
  virtual void OnPreInstall() =0;
  virtual void OnPostInstall(bool update, bool modal) =0;

diff --git a/xbmc/addons/binary-addons/AddonDll.cpp b/xbmc/addons/binary-addons/AddonDll.cpp
@@ -224,6 +224,9 @@ void CAddonDll::Destroy()
  m_pDll = nullptr;
  CLog::Log(LOGINFO, "ADDON: Dll Destroyed - %s", Name().c_str());
  }
+
+ ResetSettings();
+
  m_initialized = false;
 }