Permalink
Browse files

Provide identical functionality to previous MythScreenStack::PopScree…

…n() using MythScreenStack::PopScreen(NULL)

Update all use of PopScreen(bool, bool) following 474cdb1
  • Loading branch information...
jyavenard committed Jul 27, 2013
1 parent 7bd5d53 commit 174c6cb0c48d8e362613f42464a70ec5b6e3278d
@@ -311,7 +311,7 @@ void Weather::hideScreen()
if (!m_currScreen)
return;
m_weatherStack->PopScreen(false,false);
m_weatherStack->PopScreen(NULL, false,false);
}
void Weather::holdPage()
@@ -283,7 +283,7 @@ void MythDialogBox::Select(MythUIButtonListItem* item)
}
if (m_ScreenStack)
m_ScreenStack->PopScreen(false);
m_ScreenStack->PopScreen(NULL, false);
}
void MythDialogBox::SetReturnEvent(QObject *retobject,
@@ -95,6 +95,10 @@ void MythScreenStack::PopScreen(void)
void MythScreenStack::PopScreen(MythScreenType *screen, bool allowFade,
bool deleteScreen)
{
if (!screen)
{
screen = m_topScreen;
}
if (!screen || screen->IsDeleting())
return;
@@ -47,7 +47,7 @@ void MythThemeBase::Reload(void)
GetGlobalFontManager()->LoadFonts(GetMythUI()->GetThemeDir(), "UI");
XMLParseBase::LoadBaseTheme();
d->background->PopScreen(false, true);
d->background->PopScreen(NULL, false, true);
d->backgroundscreen = new MythScreenType(d->background, "backgroundscreen");

0 comments on commit 174c6cb

Please sign in to comment.