From d0cc0cc60e0ef6ed0a64593c93b734f606d3479d Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 12 May 2018 17:01:22 -0700
Subject: [PATCH] UI: Always enable auto-updater for windows

Makes it so the auto-updater does not have to rely on a cmake variable
being set.  Fixes a bug where deployment could accidentally be built
without the auto-updater being enabled.
---
 UI/window-basic-main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index b7860de1..a61a12c1 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -55,7 +55,7 @@
 #include "volume-control.hpp"
 #include "remote-text.hpp"
 
-#if defined(_WIN32) && defined(ENABLE_WIN_UPDATER)
+#ifdef _WIN32
 #include "win-update/win-update.hpp"
 #endif
 
@@ -2636,7 +2636,7 @@ void OBSBasic::TimedCheckForUpdates()
 #ifdef UPDATE_SPARKLE
 	init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
 				"UpdateToUndeployed"));
-#elif ENABLE_WIN_UPDATER
+#elif _WIN32
 	long long lastUpdate = config_get_int(App()->GlobalConfig(), "General",
 			"LastUpdateCheck");
 	uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
@@ -2660,7 +2660,7 @@ void OBSBasic::CheckForUpdates(bool manualUpdate)
 {
 #ifdef UPDATE_SPARKLE
 	trigger_sparkle_update();
-#elif ENABLE_WIN_UPDATER
+#elif _WIN32
 	ui->actionCheckForUpdates->setEnabled(false);
 
 	if (updateCheckThread && updateCheckThread->isRunning())
-- 
GitLab