Fix some crashes.

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index c7b32ff26f54cc0ed913199a7ff74c43ee1004a2..f921f83bd7ac4285f5cd358471ca5924446a849c 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -406,6 +406,9 @@ FilmViewer::slow_refresh ()
 bool
 FilmViewer::quick_refresh ()
 {
 bool
 FilmViewer::quick_refresh ()
 {

+       if (!_video_view || !_film) {
+               return true;
+       }

        return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
 }
 
        return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
 }
 

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 2da16f1df7775b726044c3fd9f0c370e1ac19db1..bfc611d3701dbfabbcf32f018fb25073b2e84608 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -325,9 +325,10 @@ try
                        }
 
                        get_next_frame (false);
                        }
 
                        get_next_frame (false);

-                       set_image (player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
-                       inter_position = player_video().first->inter_position();
-                       inter_size = player_video().first->inter_size();
+                       shared_ptr<PlayerVideo> pv = player_video().first;
+                       set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+                       inter_position = pv->inter_position();
+                       inter_size = pv->inter_size();

                }
                draw (inter_position, inter_size);
 
                }
                draw (inter_position, inter_size);
 

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 7e9e1a94723b11ff89a90d383494367a1e9cd068..7f93f765e72fbc84fcf4dea98fe85642c35ba89c 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -60,7 +60,9 @@ VideoView::get_next_frame (bool non_blocking)
        }
 
        shared_ptr<Butler> butler = _viewer->butler ();
        }
 
        shared_ptr<Butler> butler = _viewer->butler ();

-       DCPOMATIC_ASSERT (butler);
+       if (!butler) {
+               return false;
+       }

        add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);
        add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);