Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ebb00f3368c
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e47e0455455
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 12, 2020

  1. Fixed decodes with no configuration having blank names instead of def… 

    …ault autogenerated names
    @azonenberg
    azonenberg committed Mar 12, 2020
    Copy the full SHA
    3e47e04 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 glscopeclient/WaveformArea_events.cpp
3 changes: 3 additions & 0 deletions glscopeclient/WaveformArea_events.cpp
View file
Original file line number Diff line number Diff line change
@@ -479,7 +479,10 @@ void WaveformArea::OnProtocolDecode(string name)

//Only one input with no config required? Do default configuration
if( (decode->GetInputCount() == 1) && !decode->NeedsConfig())
{
decode->SetInput(0, m_selectedChannel);
decode->SetDefaultName();
}

//Multiple inputs or config needed? Show the dialog
else