Skip to content

Fixed crash on presenting 0 size display #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleksandr-voitenko wants to merge 1 commit into
base: streamlabs
Choose a base branch
from
Open

Fixed crash on presenting 0 size display #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions libobs/obs-display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,20 @@ void render_display(struct obs_display *display)

/* -------------------------------------------- */

if (cx == 0 || cy == 0) {
if (!display->logged_zero_size) {
blog(LOG_WARNING,
"render_display - skip present for zero-size "
"display: %p, next: %ux%u, cur: %ux%u, swap: %p)",
display, cx, cy, display->cx, display->cy,
display->swap);
display->logged_zero_size = true;
}
return;
}

display->logged_zero_size = false;

if (render_display_begin(display, cx, cy, update_color_space)) {
GS_DEBUG_MARKER_BEGIN(GS_DEBUG_COLOR_DISPLAY, "obs_display");

Expand Down
1 change: 1 addition & 0 deletions libobs/obs-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ extern void obs_view_free(struct obs_view *view);
struct obs_display {
bool update_color_space;
bool enabled;
bool logged_zero_size;
uint32_t cx, cy;
uint32_t next_cx, next_cy;
uint32_t background_color;
Expand Down