From baf980f7a6302c845a39259954265dc6059e9b70 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Fri, 2 Apr 2021 21:15:30 +1100 Subject: [PATCH] Revert "UI: Remove unnecessary IS_WIN32 macro" This reverts commit 113b6317e78cf988e70b5e8c6e03ccbc800ac5d0. --- UI/window-basic-main.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 673a6cb37..4339b8733 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4050,6 +4050,12 @@ bool OBSBasic::Active() const return outputHandler->Active(); } +#ifdef _WIN32 +#define IS_WIN32 1 +#else +#define IS_WIN32 0 +#endif + static inline int AttemptToResetVideo(struct obs_video_info *ovi) { return obs_reset_video(ovi); @@ -4168,7 +4174,7 @@ int OBSBasic::ResetVideo() } ret = AttemptToResetVideo(&ovi); - if (_WIN32 && ret != OBS_VIDEO_SUCCESS) { + if (IS_WIN32 && ret != OBS_VIDEO_SUCCESS) { if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) { blog(LOG_WARNING, "Tried to reset when " "already active");