Ticket #2793: patch2.diff

File patch2.diff, 1.0 KB (added by michel@…, 15 years ago)
  • libs/libmyth/settings.cpp

    diff -ur mythtv.org/libs/libmyth/settings.cpp mythtv/libs/libmyth/settings.cpp
    old new  
    16681668
    16691669    return clause;
    16701670}
     1671
     1672int ConfigurationWizard::exec(bool saveOnAccept, bool doLoad)
     1673{
     1674    if (doLoad)
     1675        load();
     1676
     1677    int ret = ConfigurationDialog::exec(saveOnAccept, doLoad);
     1678
     1679    if ((QDialog::Accepted == ret) && saveOnAccept)
     1680        save();
     1681
     1682    return ret;
     1683}
     1684
  • libs/libmyth/settings.h

    diff -ur mythtv.org/libs/libmyth/settings.h mythtv/libs/libmyth/settings.h
    old new  
    11601160    virtual void load(void) { cfgGrp->load(); }
    11611161    virtual void save(void) { cfgGrp->save(); }
    11621162    virtual void save(QString destination) { cfgGrp->save(destination); }
     1163    virtual int exec(bool saveOnExec = true, bool doLoad = true);
    11631164};
    11641165
    11651166/** \class JumpConfigurationWizard