summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-17 16:35:09 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-17 16:35:09 +0000
commit52cf594bedfef21f8dcee83b445d5f1630e1575a (patch)
tree2ba95a91042f4cb40e6ed68902b1a9c6430602ee /src
parent175146ae9f4c4790052a62f4d7f03c9d983589b9 (diff)
Fix infinite loop if we try to get a frame from a decoder that doesn't have one to give.
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_viewer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 78b104d20..765bff02f 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -310,6 +310,8 @@ FilmViewer::get_frame ()
shared_ptr<Image> last = _display_frame;
while (last == _display_frame) {
- _decoders.video->pass ();
+ if (_decoders.video->pass ()) {
+ break;
+ }
}
}