Skip to content

Commit

Permalink
Merge pull request xbmc#6336 from Paxxi/refactor_cleanup
Browse files Browse the repository at this point in the history
fixed indentation and style that got messed up during refactor
  • Loading branch information
Paxxi committed Feb 3, 2015
2 parents 28a42bd + 39c6e32 commit 08771c7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions xbmc/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2383,8 +2383,8 @@ bool CApplication::OnAction(const CAction &action)
if (!CBuiltins::IsSystemPowerdownCommand(action.GetName()) ||
g_PVRManager.CanSystemPowerdown())
{
CBuiltins::Execute(action.GetName());
m_navigationTimer.StartZero();
CBuiltins::Execute(action.GetName());
m_navigationTimer.StartZero();
}
return true;
}
Expand Down Expand Up @@ -3165,14 +3165,14 @@ PlayBackRet CApplication::PlayStack(const CFileItem& item, bool bRestart)
if (!haveTimes && !times.empty())
dbs.SetStackTimes(item.GetPath(), times);

if( item.m_lStartOffset == STARTOFFSET_RESUME )
if (item.m_lStartOffset == STARTOFFSET_RESUME)
{
// can only resume seek here, not dvdstate
CBookmark bookmark;
std::string path = item.GetPath();
if (item.HasProperty("original_listitem_url") && URIUtils::IsPlugin(item.GetProperty("original_listitem_url").asString()))
path = item.GetProperty("original_listitem_url").asString();
if( dbs.GetResumeBookMark(path, bookmark) )
if (dbs.GetResumeBookMark(path, bookmark))
seconds = bookmark.timeInSeconds;
else
seconds = 0.0f;
Expand Down Expand Up @@ -4386,7 +4386,7 @@ bool CApplication::ExecuteXBMCAction(std::string actionStr)
{
if (!CBuiltins::IsSystemPowerdownCommand(actionStr) ||
g_PVRManager.CanSystemPowerdown())
CBuiltins::Execute(actionStr);
CBuiltins::Execute(actionStr);
}
else
{
Expand Down

0 comments on commit 08771c7

Please sign in to comment.