diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 9e811faef..9cf1df29d 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4759,30 +4759,16 @@ int OBSBasic::ResetVideo() } ret = AttemptToResetVideo(&ovi); - if (IS_WIN32 && ret != OBS_VIDEO_SUCCESS) { - if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) { - blog(LOG_WARNING, "Tried to reset when " - "already active"); - return ret; - } - - /* Try OpenGL if DirectX fails on windows */ - if (astrcmpi(ovi.graphics_module, DL_OPENGL) != 0) { - blog(LOG_WARNING, - "Failed to initialize obs video (%d) " - "with graphics_module='%s', retrying " - "with graphics_module='%s'", - ret, ovi.graphics_module, DL_OPENGL); - ovi.graphics_module = DL_OPENGL; - ret = AttemptToResetVideo(&ovi); - } - } else if (ret == OBS_VIDEO_SUCCESS) { - ResizePreview(ovi.base_width, ovi.base_height); - if (program) - ResizeProgram(ovi.base_width, ovi.base_height); + if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) { + blog(LOG_WARNING, "Tried to reset when already active"); + return ret; } if (ret == OBS_VIDEO_SUCCESS) { + ResizePreview(ovi.base_width, ovi.base_height); + if (program) + ResizeProgram(ovi.base_width, ovi.base_height); + const float sdr_white_level = (float)config_get_uint( basicConfig, "Video", "SdrWhiteLevel"); const float hdr_nominal_peak_level = (float)config_get_uint(