Skip to content

Commit

Permalink
Allow all weather screens to be deleted
Browse files Browse the repository at this point in the history
This resolves an issue where it was impossible to delete all screens. This
was especially problematic when those screens were attached to
grabbers which no longer existed.
  • Loading branch information
stuartm committed Jul 16, 2012
1 parent 2af2156 commit 3f108e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
3 changes: 1 addition & 2 deletions mythplugins/mythweather/mythweather/weather.cpp
Expand Up @@ -151,6 +151,7 @@ bool Weather::SetupScreens()
{
if (m_firstSetup)
{
m_firstSetup = false;
// If no screens exist, run the setup
MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();

Expand All @@ -167,8 +168,6 @@ bool Weather::SetupScreens()
{
delete ssetup;
}

m_firstSetup = false;
}
else
{
Expand Down
7 changes: 0 additions & 7 deletions mythplugins/mythweather/mythweather/weatherSetup.cpp
Expand Up @@ -392,13 +392,6 @@ void ScreenSetup::loadData()

void ScreenSetup::saveData()
{
if (m_activeList->GetCount() <= 0)
{
LOG(VB_GENERAL, LOG_ERR,
"No Active Screens are defined. Nothing Saved.");
return;
}

// check if all active screens have sources/locations defined
QStringList notDefined;

Expand Down

0 comments on commit 3f108e7

Please sign in to comment.