Skip to content

Commit

Permalink
Merge pull request #293 from TheDukeofErl/bugfix/show-unconfigured-wh…
Browse files Browse the repository at this point in the history
…en-filter-but-no-selection

fix: When filter is selected but no device is selected show unconfigured
  • Loading branch information
ZyanKLee committed May 26, 2022
2 parents aea4f46 + f2d726a commit 466c9dd
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ func mainView(ctx *ntcontext, w *nucular.Window) {
w.LabelColored("NoiseTorch unconfigured", "RC", lightBlue)
}
} else if ctx.noiseSupressorState == unloaded {
w.LabelColored("NoiseTorch inactive", "RC", red)
_, inpOk := inputSelection(ctx)
_, outOk := outputSelection(ctx)
if validConfiguration(ctx, inpOk, outOk) {
w.LabelColored("NoiseTorch inactive", "RC", red)
} else {
w.LabelColored("NoiseTorch unconfigured", "RC", lightBlue)
}
} else if ctx.noiseSupressorState == inconsistent {
w.LabelColored("Inconsistent state, please unload first.", "RC", orange)
}
Expand Down Expand Up @@ -237,10 +243,7 @@ func mainView(ctx *ntcontext, w *nucular.Window) {

inp, inpOk := inputSelection(ctx)
out, outOk := outputSelection(ctx)
if (!ctx.config.FilterInput || (ctx.config.FilterInput && inpOk)) &&
(!ctx.config.FilterOutput || (ctx.config.FilterOutput && outOk)) &&
(ctx.config.FilterInput || ctx.config.FilterOutput) &&
ctx.noiseSupressorState != inconsistent {
if validConfiguration(ctx, inpOk, outOk) {
if w.ButtonText(txt) {
ctx.reloadRequired = false

Expand Down Expand Up @@ -339,6 +342,13 @@ func outputSelection(ctx *ntcontext) (device, bool) {
return device{}, false
}

func validConfiguration(ctx *ntcontext, inpOk bool, outOk bool) (bool) {
return (!ctx.config.FilterInput || (ctx.config.FilterInput && inpOk)) &&
(!ctx.config.FilterOutput || (ctx.config.FilterOutput && outOk)) &&
(ctx.config.FilterInput || ctx.config.FilterOutput) &&
ctx.noiseSupressorState != inconsistent
}

func loadingView(ctx *ntcontext, w *nucular.Window) {
w.Row(50).Dynamic(1)
w.Label("Working...", "CB")
Expand Down

0 comments on commit 466c9dd

Please sign in to comment.