diff -ur mythtv.org/libs/libmyth/settings.cpp mythtv/libs/libmyth/settings.cpp
|
old
|
new
|
|
| 1668 | 1668 | |
| 1669 | 1669 | return clause; |
| 1670 | 1670 | } |
| | 1671 | |
| | 1672 | int 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 | |
diff -ur mythtv.org/libs/libmyth/settings.h mythtv/libs/libmyth/settings.h
|
old
|
new
|
|
| 1160 | 1160 | virtual void load(void) { cfgGrp->load(); } |
| 1161 | 1161 | virtual void save(void) { cfgGrp->save(); } |
| 1162 | 1162 | virtual void save(QString destination) { cfgGrp->save(destination); } |
| | 1163 | virtual int exec(bool saveOnExec = true, bool doLoad = true); |
| 1163 | 1164 | }; |
| 1164 | 1165 | |
| 1165 | 1166 | /** \class JumpConfigurationWizard |