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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2a7a303d4b41
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3623e1b9210e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2020

  1. LeCroyOscilloscope: added missing mutex grab in AcquireData()

    @azonenberg
    azonenberg committed Jun 3, 2020
    Copy the full SHA
    3623e1b View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 scopehal/LeCroyOscilloscope.cpp
1 change: 1 addition & 0 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -1458,6 +1458,7 @@ bool LeCroyOscilloscope::AcquireData(bool toQueue)
//Re-arm the trigger if not in one-shot mode
if(!m_triggerOneShot)
{
lock_guard<recursive_mutex> lock(m_mutex);
m_transport->SendCommand("TRIG_MODE SINGLE");
m_triggerArmed = true;
}