diff --git a/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm b/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm index 8100b61ec0..c9966a78d7 100644 --- a/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm +++ b/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm @@ -116,13 +116,15 @@ static QTMovie* openMovieFromStream (InputStream* movieStream, File& movieFile) return movie; } -bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, const bool showController) +bool QuickTimeMovieComponent::loadMovie (const File& file, const bool showController) { - return loadMovie ((InputStream*) movieFile_.createInputStream(), showController); + return loadMovie (file.createInputStream(), showController); } bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, const bool showController) { + const ScopedPointer movieStreamDeleter (movieStream); + closeMovie(); if (getPeer() == nullptr) @@ -133,6 +135,9 @@ bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, const bool sh return false; } + if (movieStream == nullptr) + return false; + movie = openMovieFromStream (movieStream, movieFile); [theMovie retain];