← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to programs/mythfrontend/guidegrid.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2009-10-02 00:23:18 UTC
  • mfrom: (1.1.36 upstream)
  • Revision ID: james.westby@ubuntu.com-20091002002318-5qu2fr0gxl59egft
Tags: 0.22.0~trunk22167-0ubuntu1
* New upstream checkout (r22167).
  - Fixes some segfaults.

Show diffs side-by-side

added added

removed removed

Lines of Context:
programs/mythfrontend/guidegrid.cpp
460
460
        else if (action == "MENU")
461
461
            showMenu();
462
462
        else if (action == "ESCAPE" || action == "GUIDE")
463
 
            escape();
 
463
            Close();
464
464
        else if (action == "SELECT")
465
465
        {
466
466
            if (m_player && m_selectChangesChannel)
1835
1835
    epgIsVisibleCond.wakeAll();
1836
1836
}
1837
1837
 
1838
 
void GuideGrid::escape()
 
1838
void GuideGrid::Close()
1839
1839
{
 
1840
    // HACK: Do not allow exit if we have a popup menu open, not convinced
 
1841
    // that this is the right solution
 
1842
    if (GetMythMainWindow()->GetStack("popup stack")->TotalScreens() > 0)
 
1843
        return;
 
1844
        
1840
1845
    if (m_updateTimer)
1841
1846
        m_updateTimer->stop();
1842
1847
 
1898
1903
{
1899
1904
    ProgramInfo *pginfo = m_programInfos[m_currentRow][m_currentCol];
1900
1905
 
1901
 
    if (!pginfo)
1902
 
        return;
1903
 
 
1904
 
    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
1905
 
    CustomEdit *ce = new CustomEdit(mainStack, pginfo);
1906
 
    if (ce->Create())
1907
 
        mainStack->AddScreen(ce);
1908
 
    else
1909
 
        delete ce;
 
1906
    EditCustom(pginfo);
1910
1907
}
1911
1908
 
1912
1909
void GuideGrid::deleteRule()