OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UI: Remove unnecessary IS_WIN32 macro"

Browse source 
This reverts commit 113b6317e7.
This commit is contained in:
Matt Gajownik 2021-04-02 21:15:30 +11:00
parent 113b6317e7
commit baf980f7a6
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UI/window-basic-main.cpp
View file

@ -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");