"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xbmc/windows/GUIMediaWindow.cpp" between
xbmc-18.8-Leia.tar.gz and xbmc-18.9-Leia.tar.gz

About: XBMC is a software media player and entertainment hub for digital media that plays almost all popular audio and video formats around (new name "Kodi").

GUIMediaWindow.cpp  (xbmc-18.8-Leia):GUIMediaWindow.cpp  (xbmc-18.9-Leia)
skipping to change at line 533 skipping to change at line 533
case GUI_MSG_WINDOW_INIT: case GUI_MSG_WINDOW_INIT:
{ {
if (m_vecItems->GetPath() == "?") if (m_vecItems->GetPath() == "?")
m_vecItems->SetPath(""); m_vecItems->SetPath("");
std::string path, fileName; std::string path, fileName;
std::string dir = message.GetStringParam(0); std::string dir = message.GetStringParam(0);
URIUtils::Split(dir, path, fileName); URIUtils::Split(dir, path, fileName);
URIUtils::RemoveExtension(fileName); URIUtils::RemoveExtension(fileName);
if (StringUtils::IsInteger(fileName)) if (StringUtils::IsInteger(fileName))
dir = path; dir = path;
const std::string &ret = message.GetStringParam(1); const std::string& ret = message.GetStringParam(1);
bool returning = StringUtils::EqualsNoCase(ret, "return"); const std::string& swap = message.GetStringParam(message.GetNumStringParam
s() - 1);
const bool returning = StringUtils::EqualsNoCase(ret, "return");
const bool replacing = StringUtils::EqualsNoCase(swap, "replace");
if (!dir.empty()) if (!dir.empty())
{ {
// ensure our directory is valid // ensure our directory is valid
dir = GetStartFolder(dir); dir = GetStartFolder(dir);
bool resetHistory = false; bool resetHistory = false;
if (!returning || !URIUtils::PathEquals(dir, m_startDirectory, true)) if (!returning || !URIUtils::PathEquals(dir, m_startDirectory, true))
{ // we're not returning to the same path, so set our directory to the r equested path { // we're not returning to the same path, so set our directory to the r equested path
m_vecItems->SetPath(dir); m_vecItems->SetPath(dir);
resetHistory = true; resetHistory = true;
} }
skipping to change at line 570 skipping to change at line 573
if (!returning) if (!returning)
SetHistoryForPath(m_vecItems->GetPath()); SetHistoryForPath(m_vecItems->GetPath());
} }
} }
if (message.GetParam1() != WINDOW_INVALID) if (message.GetParam1() != WINDOW_INVALID)
{ {
// if this is the first time to this window - make sure we set the root path // if this is the first time to this window - make sure we set the root path
// if "return" is defined make sure we set the startDirectory to the dir ectory we are // if "return" is defined make sure we set the startDirectory to the dir ectory we are
// moving to (so that we can move back to where we were onBack). If we a re activating // moving to (so that we can move back to where we were onBack). If we a re activating
// the same window but with a different path, do nothing - we are simply adding to the // the same window but with a different path, do nothing - we are simply adding to the
// window history. // window history. Note that if the window is just being replaced, the s
if (message.GetParam1() != message.GetParam2()) tart directory
// also needs to be set as the manager has just popped the previous wind
ow.
if (message.GetParam1() != message.GetParam2() || replacing)
m_startDirectory = returning ? dir : GetRootPath(); m_startDirectory = returning ? dir : GetRootPath();
} }
if (message.GetParam2() == PLUGIN_REFRESH_DELAY) if (message.GetParam2() == PLUGIN_REFRESH_DELAY)
{ {
Refresh(); Refresh();
SetInitialVisibility(); SetInitialVisibility();
RestoreControlStates(); RestoreControlStates();
SetInitialVisibility(); SetInitialVisibility();
return true; return true;
} }
 End of changes. 2 change blocks. 
4 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)