diff options
| -rw-r--r-- | xbmc/Application.cpp | 16 | ||||
| -rw-r--r-- | xbmc/Application.h | 1 | ||||
| -rw-r--r-- | xbmc/interfaces/python/PythonInvoker.cpp | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 75cdfdf61a..7cdae43440 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -4139,19 +4139,6 @@ void CApplication::Process() // (this can only be done after CServiceBroker::GetGUI()->GetWindowManager().Render()) CApplicationMessenger::GetInstance().ProcessWindowMessages(); - if (m_autoExecScriptExecuted) - { - m_autoExecScriptExecuted = false; - - // autoexec.py - profile - std::string strAutoExecPy = CSpecialProtocol::TranslatePath("special://profile/autoexec.py"); - - if (XFILE::CFile::Exists(strAutoExecPy)) - CScriptInvocationManager::GetInstance().ExecuteAsync(strAutoExecPy); - else - CLog::Log(LOGDEBUG, "no profile autoexec.py (%s) found, skipping", strAutoExecPy.c_str()); - } - // handle any active scripts { @@ -4936,9 +4923,6 @@ void CApplication::SetLoggingIn(bool switchingProfiles) // would therefore write the previous skin's settings into the new profile // instead of into the previous one m_saveSkinOnUnloading = !switchingProfiles; - - // make sure that the autoexec.py script is executed after logging in - m_autoExecScriptExecuted = true; } void CApplication::CloseNetworkShares() diff --git a/xbmc/Application.h b/xbmc/Application.h index 5f94dd3e07..2a458e2aee 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -391,7 +391,6 @@ protected: bool m_ignoreSkinSettingChanges = false; bool m_saveSkinOnUnloading = true; - bool m_autoExecScriptExecuted = false; #if defined(TARGET_DARWIN_IOS) friend class CWinEventsIOS; diff --git a/xbmc/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp index c559723a16..6368969406 100644 --- a/xbmc/interfaces/python/PythonInvoker.cpp +++ b/xbmc/interfaces/python/PythonInvoker.cpp @@ -672,8 +672,6 @@ void CPythonInvoker::onError(const std::string &exceptionType /* = "" */, const std::string message; if (m_addon && !m_addon->Name().empty()) message = StringUtils::Format(g_localizeStrings.Get(2102).c_str(), m_addon->Name().c_str()); - else if (m_sourceFile == CSpecialProtocol::TranslatePath("special://profile/autoexec.py")) - message = StringUtils::Format(g_localizeStrings.Get(2102).c_str(), "autoexec.py"); else message = g_localizeStrings.Get(2103); pDlgToast->QueueNotification(CGUIDialogKaiToast::Error, message, g_localizeStrings.Get(2104)); |