Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
dsview
Commits
c71404a3
Commit
c71404a3
authored
9 years ago
by
DreamSourceLab
Browse files
Options
Download
Email Patches
Plain Diff
fix delete group signal issue when capture data is NULL
parent
297e4bde
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
DSView/pv/sigsession.cpp
DSView/pv/sigsession.cpp
+7
-4
libsigrok4DSL/hardware/DSL/dscope.c
libsigrok4DSL/hardware/DSL/dscope.c
+1
-1
No files found.
DSView/pv/sigsession.cpp
View file @
c71404a3
...
...
@@ -652,10 +652,13 @@ void SigSession::del_group()
j
++
;
}
std
::
deque
<
boost
::
shared_ptr
<
data
::
GroupSnapshot
>
>
&
snapshots
=
_group_data
->
get_snapshots
();
if
(
!
snapshots
.
empty
())
{
_group_data
->
get_snapshots
().
at
((
*
i
)
->
get_sec_index
()).
reset
();
std
::
deque
<
boost
::
shared_ptr
<
data
::
GroupSnapshot
>
>::
iterator
k
=
_group_data
->
get_
snapshots
()
.
begin
();
std
::
deque
<
boost
::
shared_ptr
<
data
::
GroupSnapshot
>
>::
iterator
k
=
snapshots
.
begin
();
k
+=
(
*
i
)
->
get_sec_index
();
_group_data
->
get_snapshots
().
erase
(
k
);
}
(
*
i
).
reset
();
i
=
_group_traces
.
erase
(
i
);
...
...
This diff is collapsed.
Click to expand it.
libsigrok4DSL/hardware/DSL/dscope.c
View file @
c71404a3
...
...
@@ -1916,7 +1916,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
struct
sr_dev_inst
*
sdi
=
devc
->
cb_data
;
for
(
l
=
sdi
->
channels
;
l
;
l
=
l
->
next
)
{
struct
sr_channel
*
probe
=
(
struct
sr_channel
*
)
l
->
data
;
channel_cnt
++
;
channel_cnt
++
;
channel_en_cnt
+=
probe
->
enabled
;
}
if
(
channel_en_cnt
==
0
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment