Skip to content

Commit 22e792c

Browse files
committed
GoXLR minis throw errors when trying to get from None
1 parent df145a6 commit 22e792c

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

goxlr/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.4.5"
1+
__version__ = "1.4.6"

goxlr/types/models.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,11 @@ class Scribble:
108108
inverted: bool
109109

110110
def __init__(self, scribble: dict):
111-
self.file_name = scribble.get("file_name")
112-
self.bottom_text = scribble.get("bottom_text")
113-
self.left_text = scribble.get("left_text")
114-
self.inverted = scribble.get("inverted")
111+
if scribble: # GoXLR Minis don't have scribbles
112+
self.file_name = scribble.get("file_name")
113+
self.bottom_text = scribble.get("bottom_text")
114+
self.left_text = scribble.get("left_text")
115+
self.inverted = scribble.get("inverted")
115116

116117

117118
@dataclass
@@ -564,10 +565,11 @@ class Effects:
564565
current: CurrentEffects
565566

566567
def __init__(self, effects: dict):
567-
self.is_enabled = effects.get("is_enabled")
568-
self.active_preset = EffectBankPreset[effects.get("active_preset")]
569-
self.preset_names = effects.get("preset_names")
570-
self.current = CurrentEffects(effects.get("current"))
568+
if effects: # GoXLR Minis don't have effects
569+
self.is_enabled = effects.get("is_enabled")
570+
self.active_preset = EffectBankPreset[effects.get("active_preset")]
571+
self.preset_names = effects.get("preset_names")
572+
self.current = CurrentEffects(effects.get("current"))
571573

572574

573575
# -------------------------------------------------------
@@ -622,11 +624,12 @@ class Sampler:
622624
banks: Dict[SampleBank, Dict[SampleButton, SampleMetadata]]
623625

624626
def __init__(self, sampler: dict):
625-
self.processing_state = SamplerProcessState(sampler.get("processing_state"))
626-
self.active_bank = SampleBank[sampler.get("active_bank")]
627-
self.clear_active = sampler.get("clear_active")
628-
self.record_buffer = sampler.get("record_buffer")
629-
self.banks = sampler.get("banks")
627+
if sampler: # GoXLR Minis don't have a sampler
628+
self.processing_state = SamplerProcessState(sampler.get("processing_state"))
629+
self.active_bank = SampleBank[sampler.get("active_bank")]
630+
self.clear_active = sampler.get("clear_active")
631+
self.record_buffer = sampler.get("record_buffer")
632+
self.banks = sampler.get("banks")
630633

631634

632635
# -------------------------------------------------------

0 commit comments

Comments
 (0)