Revert "fix: remove updater if it is not used"

This reverts commit 2ff0aa09e35eb6910ef0a030ea41f84a1ed95782.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

3 files changed, 6 insertions, 11 deletions

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index edbf609f..4be24979 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -78,7 +78,6 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
     m_languageModel = APPLICATION->translations();
     loadSettings();
 
-#ifdef LAUNCHER_WITH_UPDATER
     if(BuildConfig.UPDATER_ENABLED)
     {
         QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
@@ -91,9 +90,11 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
         {
             APPLICATION->updateChecker()->updateChanList(false);
         }
-        ui->updateSettingsBox->setHidden(false);
     }
-#endif
+    else
+    {
+        ui->updateSettingsBox->setHidden(true);
+    }
     connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
     connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 }
@@ -188,7 +189,6 @@ void LauncherPage::on_metadataDisableBtn_clicked()
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
 }
 
-#ifdef LAUNCHER_WITH_UPDATER
 void LauncherPage::refreshUpdateChannelList()
 {
     // Stop listening for selection changes. It's going to change a lot while we update it and
@@ -260,7 +260,6 @@ void LauncherPage::refreshUpdateChannelDesc()
         m_currentUpdateChannel = selected.id;
     }
 }
-#endif
 
 void LauncherPage::applySettings()
 {
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index ccfd7e9e..f38c922e 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -90,7 +90,6 @@ slots:
     void on_iconsDirBrowseBtn_clicked();
     void on_metadataDisableBtn_clicked();
 
-#ifdef LAUNCHER_WITH_UPDATER
     /*!
      * Updates the list of update channels in the combo box.
      */
@@ -101,13 +100,13 @@ slots:
      */
     void refreshUpdateChannelDesc();
 
-    void updateChannelSelectionChanged(int index);
-#endif
     /*!
      * Updates the font preview
      */
     void refreshFontPreview();
 
+    void updateChannelSelectionChanged(int index);
+
 private:
     Ui::LauncherPage *ui;
 
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index ceb68c5b..417bbe05 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -50,9 +50,6 @@
          <property name="title">
           <string>Update Settings</string>
          </property>
-         <property name="visible">
-          <bool>false</bool>
-         </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <widget class="QCheckBox" name="autoUpdateCheckBox">