Skip to content
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

Jump to bottom

Unrevert "Dual Output collection: refactor create, optimize load, repair on load." #5002

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Unrevert "Dual Output collection: refactor create, optimize load, repair on load." #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8edbbe5
Revert "Revert "Revert "Revert "Dual Output collection: refactor crea…
gettinToasty May 14, 2024
62d1396
Fix for empty image export error.
michelinewu May 14, 2024
8302ecf
Fix catch any.
michelinewu May 14, 2024
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
1 change: 0 additions & 1 deletion app/components-react/editor/elements/SceneSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { ERenderingMode } from '../../../../obs-api';
import styles from './SceneSelector.m.less';
import useBaseElement from './hooks';
import { IScene } from 'services/scenes';
import { ISceneCollectionsManifestEntry } from 'services/scene-collections';

function SceneSelector() {
const {
Expand Down
2 changes: 1 addition & 1 deletion app/components-react/root/StudioEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ function DualOutputProgressBar(p: { sceneId: string }) {
const [current, setCurrent] = useState(0);

const v = useVuex(() => ({
total: ScenesService.views.getSceneItemsBySceneId(p.sceneId)?.length ?? 1,
total: ScenesService.views.getSceneNodesBySceneId(p.sceneId)?.length ?? 1,
}));

useSubscription(DualOutputService.sceneNodeHandled, index => setCurrent(index));
Expand Down
2 changes: 1 addition & 1 deletion app/components-react/windows/go-live/dual-output/UltraDestinationSwitchers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ function DestinationSwitcher(p: IDestinationSwitcherProps) {

return (
<div
ref={containerRef}
data-test="ultra-switcher"
ref={containerRef}
className={cx(styles.platformSwitcher, { [styles.platformDisabled]: !p.enabled })}
onClick={() => {
if (p.promptConnectTikTok) {
Expand Down
3 changes: 2 additions & 1 deletion app/i18n/en-US/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
"This account is already linked to another Streamlabs Account. Please use a different account.": "This account is already linked to another Streamlabs Account. Please use a different account.",
"Successfully unlinked account": "Successfully unlinked account",
"Successfully merged account": "Successfully merged account",
"Account merge error": "Account merge error"
"Account merge error": "Account merge error",
"Loading scene...": "Loading scene..."
}
Loading
Loading