Null check macOS window handle before detaching view #374

Merged

sebastian-s-beckmann merged 1 commit from hack-the-hack into master

2022-08-05 19:18:55 -05:00

sebastian-s-beckmann commented

2022-08-04 19:25:17 -05:00

(Migrated from github.com)

Description

Fixes a crash with service integrations.
What the original code does is decoupling the browser from the widget (more explanation is in the comment a few lines above the modified). For some reason however, on Qt 6 the window handle can be null sometimes. In that case, trying to detach the view from the view from the superview fails (obviously).

By the way, the code looks cursed for two reasons:

It's Objective-C in a C(++) file
It was unreadable even before. If desired I can untangle the original code.

Motivation and Context

Don't want crashes.

How Has This Been Tested?

macOS 13.
No more crashes with Twitch integration.

Types of changes

Bug fix (non-breaking change which fixes an issue)

Checklist:

My code has been run through clang-format.
I have read the contributing document.
My code is not on the master branch.
The code has been tested.
All commit messages are properly formatted and commits squashed where appropriate.
I have included updates to all appropriate documentation.

### Description   Fixes a crash with service integrations. What the original code does is decoupling the browser from the widget (more explanation is in the comment a few lines above the modified). For some reason however, on Qt 6 the window handle can be null sometimes. In that case, trying to detach the view from the view from the superview fails (obviously). By the way, the code looks cursed for two reasons: 1) It's Objective-C in a C(++) file 2) It was unreadable even before. If desired I can untangle the original code. ### Motivation and Context    Don't want crashes. ### How Has This Been Tested?    macOS 13. No more crashes with Twitch integration. ### Types of changes  - Bug fix (non-breaking change which fixes an issue)       ### Checklist:   - [x] My code has been run through [clang-format](https://github.com/obsproject/obs-studio/blob/master/.clang-format). - [x] I have read the [**contributing** document](https://github.com/obsproject/obs-studio/blob/master/CONTRIBUTING.rst). - [x] My code is not on the master branch. - [x] The code has been tested. - [x] All commit messages are properly formatted and commits squashed where appropriate. - [x] I have included updates to all appropriate documentation.

WizardCM (Migrated from github.com) approved these changes

2022-08-04 19:27:27 -05:00

WizardCM (Migrated from github.com) left a comment

Conceptually this matches the if (hwnd) { on Windows, so it looks good to me.

Conceptually this matches the `if (hwnd) {` on Windows, so it looks good to me.

WizardCM commented

2022-08-04 19:35:03 -05:00

(Migrated from github.com)

Also we can save untangling the code for post-28 in my opinion.

No reviewers

WizardCM

No milestone

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

gh-obsproject/obs-browser!374

No description provided.

Rows
Columns