From d8048863e8bddd320df654cf48e5c11db13d52f4 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sat, 4 Jul 2015 12:18:11 +0300
Subject: [PATCH] movie::frame_subframes: Gracefully handle invalid frame
 numbers

Doesn't fix cache invalidation errors tho.
---
 src/library/movie.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/library/movie.cpp b/src/library/movie.cpp
index f3ce5d76..efeabbff 100644
--- a/src/library/movie.cpp
+++ b/src/library/movie.cpp
@@ -308,6 +308,8 @@ size_t movie::restore_state(uint64_t curframe, uint64_t lagframe, const std::vec
 
 uint64_t movie::frame_subframes(uint64_t frame) throw()
 {
+	if(!frame) return 0;
+	if(frame > movie_data->size()) return 0;
 	if(frame < cached_frame)
 		clear_caches();
 	uint64_t p = cached_subframe;
-- 
2.11.4.GIT