summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-08 19:17:44 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-08 19:17:44 +0100
commit6925163806c96442f624d0d60c696e3da5bc996e (patch)
tree43b4ddaded1c072876c06174827c480837810343
parent10923c4b0dd065ef73cb33517fe858d78237b397 (diff)
Couple of fixes to updating things when removing content.
-rw-r--r--src/wx/film_editor.cc2
-rw-r--r--src/wx/film_viewer.cc8
2 files changed, 4 insertions, 6 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a9aa155af..894e2ae2b 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1204,6 +1204,8 @@ FilmEditor::setup_content ()
/* Select the first item of content if non was selected before */
_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
+
+ setup_content_information ();
}
void
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e9a1a574b..03f0ca646 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -258,12 +258,8 @@ FilmViewer::paint_panel (wxPaintEvent &)
void
FilmViewer::slider_moved (wxScrollEvent &)
{
- if (!_film || !_player) {
- return;
- }
-
- if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
- return;
+ if (_film && _player) {
+ _player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()));
}
get_frame ();