Merge pull request #18305 from enen92/stopallscripts

[python] Stop any running scripts on shutdown
xbmc · Aug 25, 2020 · f80d155 · f80d155
2 parents 943faf8 + d042659
commit f80d155
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -2679,6 +2679,9 @@ void CApplication::Stop(int exitCode)
     // Stop services before unloading Python
     CServiceBroker::GetServiceAddons().Stop();
 
+    // Stop any other python scripts that may be looping waiting for monitor.abortRequested()
+    CScriptInvocationManager::GetInstance().StopRunningScripts();
+
     // unregister action listeners
     UnregisterActionListener(&m_appPlayer.GetSeekHandler());
     UnregisterActionListener(&CPlayerController::GetInstance());

diff --git a/xbmc/interfaces/generic/ScriptInvocationManager.cpp b/xbmc/interfaces/generic/ScriptInvocationManager.cpp
@@ -359,6 +359,15 @@ bool CScriptInvocationManager::Stop(int scriptId, bool wait /* = false */)
   return invokerThread->Stop(wait);
 }
 
+void CScriptInvocationManager::StopRunningScripts(bool wait /* = false */)
+{
+  for (auto& it : m_scripts)
+  {
+    if (!it.second.done)
+      Stop(it.second.script, wait);
+  }
+}
+
 bool CScriptInvocationManager::Stop(const std::string &scriptPath, bool wait /* = false */)
 {
   if (scriptPath.empty())

diff --git a/xbmc/interfaces/generic/ScriptInvocationManager.h b/xbmc/interfaces/generic/ScriptInvocationManager.h
@@ -115,6 +115,12 @@ class CScriptInvocationManager
   bool Stop(int scriptId, bool wait = false);
   bool Stop(const std::string &scriptPath, bool wait = false);
 
+  /*!
+   *\brief Stop all running scripts
+   *\param wait if kodi should wait for each script to finish (default false)
+  */
+  void StopRunningScripts(bool wait = false);
+
   bool IsRunning(int scriptId) const;
   bool IsRunning(const std::string& scriptPath) const;