diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-07-09 15:06:11 +0200 |
|---|---|---|
| committer | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-07-09 15:06:11 +0200 |
| commit | c34f46571aa344cea8ee9a42581a180e8460ecd6 (patch) | |
| tree | c44496202d29e254e421fa64327559b9afc62b4e | |
| parent | ca773c6faa4ae39861af1b81730e44ec6043474c (diff) | |
| parent | 67b0639a0020a5d784c8acc0d833cb332ebde4b2 (diff) | |
Merge pull request #7459 from olafhering/master
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 2 | ||||
| -rw-r--r-- | xbmc/profiles/Profile.cpp | 4 | ||||
| -rw-r--r-- | xbmc/utils/FileUtils.cpp | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 6858775c35..7f24a85c44 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -1804,10 +1804,12 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string * { const CGUIViewState *viewState = ((CGUIMediaWindow*)window)->GetViewState(); if (viewState) + { if (info == CONTAINER_SORT_METHOD) strLabel = g_localizeStrings.Get(viewState->GetSortMethodLabel()); else if (info == CONTAINER_SORT_ORDER) strLabel = g_localizeStrings.Get(viewState->GetSortOrderLabel()); + } } } break; diff --git a/xbmc/profiles/Profile.cpp b/xbmc/profiles/Profile.cpp index 210612f21d..49af2a7380 100644 --- a/xbmc/profiles/Profile.cpp +++ b/xbmc/profiles/Profile.cpp @@ -82,7 +82,9 @@ void CProfile::Load(const TiXmlNode *node, int nextIdProfile) XMLUtils::GetBoolean(node, "hassources", m_bSources); XMLUtils::GetBoolean(node, "canwritesources", m_bCanWriteSources); XMLUtils::GetBoolean(node, "lockaddonmanager", m_locks.addonManager); - XMLUtils::GetInt(node, "locksettings", (int&)m_locks.settings); + int settings = m_locks.settings; + XMLUtils::GetInt(node, "locksettings", settings); + m_locks.settings = (LOCK_LEVEL::SETTINGS_LOCK)settings; XMLUtils::GetBoolean(node, "lockfiles", m_locks.files); XMLUtils::GetBoolean(node, "lockmusic", m_locks.music); XMLUtils::GetBoolean(node, "lockvideo", m_locks.video); diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp index 43ea6273f0..3ff65b05e0 100644 --- a/xbmc/utils/FileUtils.cpp +++ b/xbmc/utils/FileUtils.cpp @@ -227,4 +227,5 @@ CDateTime CFileUtils::GetModificationDate(const std::string& strFileNameAndPath, { CLog::Log(LOGERROR, "%s unable to extract modification date for file (%s)", __FUNCTION__, strFileNameAndPath.c_str()); } + return dateAdded; } |