scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 00:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

GL disp.: small fixes

Browse Source 
- try-catch state_gl constructor (now it can throw)
- added a explaining comment
This commit is contained in:
Martin Pulec
2022-06-23 17:05:23 +02:00
parent 319beb357f
commit 2f43ec3d76
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_display/gl.cpp
View File

@@ -665,7 +665,12 @@ static void *display_gl_parse_fmt(struct state_gl *s, char *ptr) {
static void * display_gl_init(struct module *parent, const char *fmt, unsigned int flags) {
UNUSED(flags);
struct state_gl *s = new state_gl(parent);
struct state_gl *s = nullptr;
try {
s = new state_gl(parent);
} catch (...) {
return nullptr;
}
if (fmt != NULL) {
char *tmp = strdup(fmt);
@@ -676,7 +681,7 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
LOG(LOG_LEVEL_ERROR) << MOD_NAME << "Invalid numeric value for an option!\n";
}
free(tmp);
if (ret != s) {
if (ret != s) { // ret is either nullptr or &display_init_noerr (help requested)
delete s;
return ret;
}