Skip to content

OBS 31.1.2 Merge #5684

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 11 commits into
base: staging
Choose a base branch
from
+8 −8
Open

OBS 31.1.2 Merge #5684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c78711
OSN 0.26.1test2
aleksandr-voitenko Dec 10, 2025
198b863
Merged branch master into obs_merge_31.1.2
aleksandr-voitenko Dec 11, 2025
e29fbbb
Merged branch staging into obs_merge_31.1.2
aleksandr-voitenko Dec 11, 2025
5c7d438
Fixing OBS Importer tests
aleksandr-voitenko Dec 12, 2025
12839a1
Merged branch staging into obs_merge_31.1.2
aleksandr-voitenko Dec 12, 2025
0010023
OSN 0.26.1test3. Pulled latest changes
aleksandr-voitenko Dec 15, 2025
b3afa5f
Merge branch 'staging' into obs_merge_31.1.2
aleksandr-voitenko Dec 16, 2025
f843e48
mac: enable enhanced broadcasting checkbox (#5705)
sandboxcoder Jan 14, 2026
777cc6a
Merged branch master into obs_merge_31.1.2
aleksandr-voitenko Jan 29, 2026
25899cb
OSN 0.26.1test7
aleksandr-voitenko Jan 30, 2026
21df6ef
Merged branch staging into obs_merge_31.1.2
aleksandr-voitenko Jan 30, 2026
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
3 changes: 2 additions & 1 deletion app/components-react/windows/go-live/platforms/TwitchEditStreamInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export function TwitchEditStreamInfo(p: IPlatformComponentParams<'twitch'>) {
>
<CheckboxInput label={$t('Stream features branded content')} {...bind.isBrandedContent} />
</InputWrapper>
{process.platform !== 'darwin' && (
{(process.platform !== 'darwin' ||
(process.platform === 'darwin' && process.arch === 'arm64')) && (
<InputWrapper
layout={p.layout}
className={cx(styles.twitchCheckbox, { [styles.hideLabel]: p.layout === 'vertical' })}
Expand Down
2 changes: 1 addition & 1 deletion scripts/repositories.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "obs-studio-node",
"url": "https://s3-us-west-2.amazonaws.com/obsstudionodes3.streamlabs.com/",
"archive": "osn-[VERSION]-release-[OS][ARCH].tar.gz",
"version": "0.25.82",
"version": "0.26.1test7",
"win64": true,
"osx": true
},
Expand Down
11 changes: 5 additions & 6 deletions test/regular/obs-importer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ test('OBS Importer', async t => {
await click('button=Continue');
await click('button=Skip');

/*
await click('a=Login');
await isDisplayed('button=Log in with Twitch');
await click('button=Skip');
*/

await logIn(t, 'twitch', { prime: false }, false, true);
await sleep(1000);

Expand Down Expand Up @@ -93,6 +87,11 @@ test('OBS Importer', async t => {
// check that widgets have been migrated
await focusMain();
await switchCollection('Widgets');

// Without this sleep widgetsService might have empty widgetSources
// TODO: Certainly, there is a race condition that should be addressed.
await sleep(1000);

const api = await getApiClient();
const widgetsService = api.getResource<WidgetsService>('WidgetsService');

Expand Down
Loading