diff --git a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch index 658c7a9e04..532ed0ecca 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -1,4 +1,4 @@ -From 332f8f5c552f695d4e893512a642f9f9bbed6d9e Mon Sep 17 00:00:00 2001 +From a4632124ca32374fd1ab728f30be9aaa79186ba5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 19 Mar 2019 18:06:56 +0000 Subject: [PATCH] handle SIGTERM @@ -23,10 +23,10 @@ so, when shutdown/reboot is requested: 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index bfa6083209..a7fbe8afd5 100644 +index 1b623d0..bfae2a9 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2029,12 +2029,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2024,12 +2024,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) switch (msg) { case TMSG_POWERDOWN: @@ -41,7 +41,7 @@ index bfa6083209..a7fbe8afd5 100644 break; case TMSG_SHUTDOWN: -@@ -2055,12 +2055,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2050,12 +2050,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) case TMSG_RESTART: case TMSG_RESET: @@ -56,7 +56,7 @@ index bfa6083209..a7fbe8afd5 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2522,6 +2523,17 @@ bool CApplication::Cleanup() +@@ -2533,6 +2534,17 @@ bool CApplication::Cleanup() } } @@ -73,8 +73,8 @@ index bfa6083209..a7fbe8afd5 100644 + void CApplication::Stop(int exitCode) { - CLog::Log(LOGNOTICE, "Stopping player"); -@@ -2548,7 +2560,7 @@ void CApplication::Stop(int exitCode) + CLog::Log(LOGINFO, "Stopping player"); +@@ -2559,7 +2571,7 @@ void CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -83,28 +83,28 @@ index bfa6083209..a7fbe8afd5 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode); // Abort any active screensaver -@@ -2580,7 +2592,6 @@ void CApplication::Stop(int exitCode) +@@ -2591,7 +2603,6 @@ void CApplication::Stop(int exitCode) // Needs cleaning up CApplicationMessenger::GetInstance().Stop(); m_AppFocused = false; - m_ExitCode = exitCode; - CLog::Log(LOGNOTICE, "Stopping all"); + CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -4111,7 +4122,7 @@ void CApplication::ProcessSlow() +@@ -4163,7 +4174,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { - CLog::Log(LOGNOTICE, "Quitting due to POSIX signal"); + CLog::Log(LOGINFO, "Quitting due to POSIX signal"); - CApplicationMessenger::GetInstance().PostMsg(TMSG_QUIT); + CApplicationMessenger::GetInstance().PostMsg(TMSG_RESTARTAPP); } #endif diff --git a/xbmc/Application.h b/xbmc/Application.h -index 57b006b60c..5b66d7f09f 100644 +index 09a4564..60493dc 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -156,6 +156,7 @@ public: +@@ -155,6 +155,7 @@ public: bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false); bool IsCurrentThread() const; @@ -113,10 +113,10 @@ index 57b006b60c..5b66d7f09f 100644 void UnloadSkin(bool forReload = false); bool LoadCustomWindows(); diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp -index fb0bd6c70d..4f829512f1 100644 +index 8982725..95070fb 100644 --- a/xbmc/XBApplicationEx.cpp +++ b/xbmc/XBApplicationEx.cpp -@@ -24,6 +24,7 @@ CXBApplicationEx::CXBApplicationEx() +@@ -23,6 +23,7 @@ CXBApplicationEx::CXBApplicationEx() m_bStop = false; m_AppFocused = true; m_ExitCode = EXITCODE_QUIT; @@ -125,7 +125,7 @@ index fb0bd6c70d..4f829512f1 100644 } diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h -index e7534b8c05..8f45f04ec8 100644 +index e7534b8..8f45f04 100644 --- a/xbmc/XBApplicationEx.h +++ b/xbmc/XBApplicationEx.h @@ -29,6 +29,7 @@ public: @@ -137,10 +137,10 @@ index e7534b8c05..8f45f04ec8 100644 bool m_renderGUI; diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp -index 9e65e939fc..fec636a417 100644 +index 5e40077..6dc2cbb 100644 --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp -@@ -76,8 +76,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() +@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() bool CLogindUPowerSyscall::Powerdown() { @@ -150,5 +150,5 @@ index 9e65e939fc..fec636a417 100644 } -- -2.19.1 +2.20.1