Skip to content

Commit

Permalink
fix: when start Sisyfos for the first time, it will crash if you touc…
Browse files Browse the repository at this point in the history
…h faders
  • Loading branch information
olzzon committed Dec 14, 2021
1 parent 3d6db88 commit 102e58a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
9 changes: 7 additions & 2 deletions server/reducers/fadersReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ export interface IVuMeters {
reductionVal: number
}

const defaultFadersReducerState = (numberOfFaders: number): IFaders[] => {
export const defaultFadersReducerState = (
numberOfFaders: number
): IFaders[] => {
let defaultObj: Array<IFaders> = [
{
fader: [],
Expand Down Expand Up @@ -120,7 +122,10 @@ export const faders = (
emptyState[0].vuMeters = [...state[0].vuMeters]
}
nextState = emptyState
if (action.allState.fader.length == nextState[0].fader.length) {
if (
action.allState.fader.length > 0 &&
action.allState.fader.length == nextState[0].fader.length
) {
action.allState.fader.map((channel: any, index: number) => {
nextState[0].fader[index] = channel
})
Expand Down
14 changes: 12 additions & 2 deletions server/utils/SettingsStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { storeSetCompleteChState } from '../reducers/channelActions'
import { storeSetCompleteFaderState } from '../reducers/faderActions'
import { logger } from './logger'
import { InumberOfChannels } from '../reducers/channelsReducer'
import { IFaders } from '../reducers/fadersReducer'
import { defaultFadersReducerState, IFaders } from '../reducers/fadersReducer'
import { IChannels } from '../reducers/channelsReducer'

import { ICustomPages, ISettings } from '../reducers/settingsReducer'
Expand Down Expand Up @@ -81,7 +81,17 @@ export const loadSnapshotState = (
)
}
} catch (error) {
logger.data(error).error('Error loading Snapshot')
if (fileName.includes('default.shot')) {
store.dispatch(
storeSetCompleteFaderState(
defaultFadersReducerState(numberOfFaders)[0],
numberOfFaders
)
)
logger.data(error).error('Initializing empty faders')
} else {
logger.data(error).error('Error loading Snapshot')
}
}
}

Expand Down

0 comments on commit 102e58a

Please sign in to comment.