projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c54ed6
)
swaroop: fix phantom entries when loading/saving playlists.
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Dec 2018 22:24:54 +0000
(22:24 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 18 Dec 2018 22:24:54 +0000
(22:24 +0000)
src/tools/dcpomatic_playlist.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_playlist.cc
b/src/tools/dcpomatic_playlist.cc
index fe49a261070752c328e6e9762f05bc1756e32f23..0b8f935b3aaf0d8dc02ba1b3e7dcd0599b092e10 100644
(file)
--- a/
src/tools/dcpomatic_playlist.cc
+++ b/
src/tools/dcpomatic_playlist.cc
@@
-161,7
+161,6
@@
private:
item.SetId (_list->GetItemCount());
long const N = _list->InsertItem (item);
set_item (N, e);
item.SetId (_list->GetItemCount());
long const N = _list->InsertItem (item);
set_item (N, e);
- _playlist.add (e);
}
void selection_changed ()
}
void selection_changed ()
@@
-230,7
+229,9
@@
private:
if (r == wxID_OK) {
shared_ptr<Content> content = _content_dialog->selected ();
if (content) {
if (r == wxID_OK) {
shared_ptr<Content> content = _content_dialog->selected ();
if (content) {
- add (SPLEntry(content));
+ SPLEntry e (content);
+ add (e);
+ _playlist.add (e);
}
}
}
}
}
}
@@
-295,6
+296,7
@@
private:
_list->DeleteAllItems ();
_playlist.read (wx_to_std(d->GetPath()), _content_dialog);
if (!_playlist.missing()) {
_list->DeleteAllItems ();
_playlist.read (wx_to_std(d->GetPath()), _content_dialog);
if (!_playlist.missing()) {
+ _list->DeleteAllItems ();
BOOST_FOREACH (SPLEntry i, _playlist.get()) {
add (i);
}
BOOST_FOREACH (SPLEntry i, _playlist.get()) {
add (i);
}