Merge branch 'master' into apa-notification-on-live

src/widgets/dialogs/SettingsDialog.cpp

@@ -5,6 +5,7 @@
 #include "widgets/helper/SettingsDialogTab.hpp"
 #include "widgets/settingspages/AboutPage.hpp"
 #include "widgets/settingspages/AccountsPage.hpp"
+#include "widgets/settingspages/AdvancedPage.hpp"
 #include "widgets/settingspages/BrowserExtensionPage.hpp"
 #include "widgets/settingspages/CommandPage.hpp"
 #include "widgets/settingspages/EmotesPage.hpp"
@@ -105,6 +106,7 @@ void SettingsDialog::addTabs()
     //    this->addTab(new SpecialChannelsPage);
     this->addTab(new BrowserExtensionPage);
     this->addTab(new ExternalToolsPage);
+    this->addTab(new AdvancedPage);
 
     this->ui_.tabContainer->addStretch(1);
     this->addTab(new AboutPage, Qt::AlignBottom);
@@ -156,7 +158,7 @@ void SettingsDialog::showDialog(PreferredTab preferredTab)
 
 void SettingsDialog::refresh()
 {
-    getApp()->settings->saveSnapshot();
+    getSettings()->saveSnapshot();
 
     for (auto *tab : this->tabs_) {
         tab->getSettingsPage()->onShow();
@@ -201,7 +203,7 @@ void SettingsDialog::onCancelClicked()
         tab->getSettingsPage()->cancel();
     }
 
-    getApp()->settings->restoreSnapshot();
+    getSettings()->restoreSnapshot();
 
     this->close();
 }