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: 62c2b78a2c4a
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: 679e6cda23ba
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Dec 3, 2020

  1. HistoryWindow: don't crash on invalid history depths. Fixes #291.

    @azonenberg
    azonenberg committed Dec 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    679e6cd View commit details
Showing with 7 additions and 1 deletion.
  1. +1 −1 lib
  2. +6 −0 src/glscopeclient/HistoryWindow.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 3 files
+47 −16 scopehal/Filter.cpp
+12 −9 scopeprotocols/EyePattern.cpp
+4 −2 scopeprotocols/JitterSpectrumFilter.cpp
6 changes: 6 additions & 0 deletions src/glscopeclient/HistoryWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -194,8 +194,14 @@ void HistoryWindow::OnWaveformDataReady()
m_tree.get_selection()->select(row);

//Remove extra waveforms, if we have any.
//Clamp to 1 if the user types zero or something non-numeric
string smax = m_maxBox.get_text();
size_t nmax = atoi(smax.c_str());
if(nmax < 1)
{
m_maxBox.set_text("1");
nmax = 1;
}
auto children = m_model->children();
while(children.size() > nmax)
{