@@ -811,15 +811,24 @@ open class DeckPicker :
811811 if (fragmented) {
812812 loadStudyOptionsFragment()
813813
814- ResizablePaneManager (
815- parentLayout = requireNotNull(binding.deckpickerXlView),
816- divider = requireNotNull(binding.resizingDivider),
817- leftPane = deckPickerBinding.root,
818- rightPane = requireNotNull(binding.studyoptionsFragment),
819- sharedPrefs = Prefs .getUiConfig(this ),
820- leftPaneWeightKey = PREF_DECK_PICKER_PANE_WEIGHT ,
821- rightPaneWeightKey = PREF_STUDY_OPTIONS_PANE_WEIGHT ,
822- )
814+ val xlView = binding.deckpickerXlView
815+ val divider = binding.resizingDivider
816+ val rightPaneView = binding.studyoptionsFragment
817+
818+ // Avoid crash if tablet layout is not actually loaded
819+ if (xlView != null && divider != null && rightPaneView != null ) {
820+ ResizablePaneManager (
821+ parentLayout = xlView,
822+ divider = divider,
823+ leftPane = deckPickerBinding.root,
824+ rightPane = rightPaneView,
825+ sharedPrefs = Prefs .getUiConfig(this ),
826+ leftPaneWeightKey = PREF_DECK_PICKER_PANE_WEIGHT ,
827+ rightPaneWeightKey = PREF_STUDY_OPTIONS_PANE_WEIGHT ,
828+ )
829+ } else {
830+ Timber .w(" XL PaneManager skipped because one or more views were null" )
831+ }
823832 }
824833 }
825834 is StartupResponse .FatalError -> handleStartupFailure(response.failure)
0 commit comments