Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[cosmetic] remove unused m_skinReloading variable

  • Loading branch information...
commit 3618081fa46a5ac8b0da924b9f92bf01f927bf68 1 parent 79ace29
Jonathan Marshall authored
Showing with 0 additions and 8 deletions.
  1. +0 −7 xbmc/Application.cpp
  2. +0 −1  xbmc/Application.h
7 xbmc/Application.cpp
View
@@ -402,7 +402,6 @@ CApplication::CApplication(void)
m_nextPlaylistItem = -1;
m_bPlaybackStarting = false;
m_ePlayState = PLAY_STATE_NONE;
- m_skinReloading = false;
m_skinReverting = false;
m_loggingIn = false;
@@ -1810,7 +1809,6 @@ bool CApplication::OnSettingsSaving() const
void CApplication::ReloadSkin(bool confirm/*=false*/)
{
- m_skinReloading = false;
std::string oldSkin = g_SkinInfo ? g_SkinInfo->ID() : "";
CGUIMessage msg(GUI_MSG_LOAD_SKIN, -1, g_windowManager.GetActiveWindow());
@@ -1882,9 +1880,6 @@ bool CApplication::Save(TiXmlNode *settings) const
bool CApplication::LoadSkin(const CStdString& skinID)
{
- if (m_skinReloading)
- return false;
-
AddonPtr addon;
if (CAddonMgr::Get().GetAddon(skinID, addon, ADDON_SKIN))
{
@@ -2037,8 +2032,6 @@ bool CApplication::LoadSkin(const SkinPtr& skin)
void CApplication::UnloadSkin(bool forReload /* = false */)
{
- m_skinReloading = forReload;
-
CLog::Log(LOGINFO, "Unloading old skin %s...", forReload ? "for reload " : "");
g_audioManager.Enable(false);
1  xbmc/Application.h
View
@@ -367,7 +367,6 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
bool LoadSkin(const CStdString& skinID);
bool LoadSkin(const boost::shared_ptr<ADDON::CSkinInfo>& skin);
- bool m_skinReloading; // if true we disallow LoadSkin until ReloadSkin is called
bool m_skinReverting;
bool m_loggingIn;
Please sign in to comment.
Something went wrong with that request. Please try again.