summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-01 16:06:09 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-01 16:06:09 +0000
commitd1b3ee4deef6e43dd9dc703e6c0969f17b97a8f6 (patch)
tree7953f749296dd24dc3832abc9df87df8e4fdc78a /src/wx
parent17a5cd574acefdc693c28d68167e50c87680b84b (diff)
Catch a couple of exceptions; hopefully fix trimming behaviour.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e6b8bf8dd..e9c668a71 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -213,8 +213,14 @@ void
FilmViewer::slider_moved ()
{
if (_film && _player) {
- _player->seek (_slider->GetValue() * _film->length() / 4096, false);
- fetch_next_frame ();
+ try {
+ _player->seek (_slider->GetValue() * _film->length() / 4096, false);
+ fetch_next_frame ();
+ } catch (OpenFileError& e) {
+ /* There was a problem opening a content file; we'll let this slide as it
+ probably means a missing content file, which we're already taking care of.
+ */
+ }
}
}
@@ -382,8 +388,14 @@ FilmViewer::back_clicked ()
p = 0;
}
- _player->seek (p, true);
- fetch_next_frame ();
+ try {
+ _player->seek (p, true);
+ fetch_next_frame ();
+ } catch (OpenFileError& e) {
+ /* There was a problem opening a content file; we'll let this slide as it
+ probably means a missing content file, which we're already taking care of.
+ */
+ }
}
void