mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-19 19:55:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Always enable auto-updater for windows

Browse Source 
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.
This commit is contained in:
jp9000
2018-05-12 17:01:22 -07:00
parent b41ca1ca14
commit d0cc0cc60e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-main.cpp
View File

@@ -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())