Showing the changes to interface/src/Menu.cpp (1 of 2 files). Show all
Unified · Split
| @@ -512,8 +512,8 @@ void Menu::loadSettings(QSettings* settings) { · 511 unmodified lines | |||
| 512 | scanMenuBar(&loadAction, settings); | 512 | scanMenuBar(&loadAction, settings); |
| 513 | Application::getInstance()->getAvatar()->loadData(settings); | 513 | Application::getInstance()->getAvatar()->loadData(settings); |
| 514 | Application::getInstance()->getSwatch()->loadData(settings); | 514 | Application::getInstance()->getSwatch()->loadData(settings); |
| 515 | 515 | Application::getInstance()->getProfile()->loadData(settings); | |
| 516 | // NodeList and profile settings are not loaded here because the Application will load them immediately on start | 516 | NodeList::getInstance()->loadData(settings); |
| 517 | } | 517 | } |
| 518 | 518 | ||
| 519 | void Menu::saveSettings(QSettings* settings) { | 519 | void Menu::saveSettings(QSettings* settings) { |
| @@ -535,11 +535,7 @@ void Menu::saveSettings(QSettings* settings) { · 15 unmodified lines | |||
| 535 | scanMenuBar(&saveAction, settings); | 535 | scanMenuBar(&saveAction, settings); |
| 536 | Application::getInstance()->getAvatar()->saveData(settings); | 536 | Application::getInstance()->getAvatar()->saveData(settings); |
| 537 | Application::getInstance()->getSwatch()->saveData(settings); | 537 | Application::getInstance()->getSwatch()->saveData(settings); |
| 538 | |||
| 539 | // save the user profile | ||
| 540 | Application::getInstance()->getProfile()->saveData(settings); | 538 | Application::getInstance()->getProfile()->saveData(settings); |
| 541 | |||
| 542 | // ask the NodeList to save its data | ||
| 543 | NodeList::getInstance()->saveData(settings); | 539 | NodeList::getInstance()->saveData(settings); |
| 544 | } | 540 | } |
| 545 | 541 | ||