diff --git a/dom/media/hls/HLSDemuxer.cpp b/dom/media/hls/HLSDemuxer.cpp index e0d450f320b9..39b32ee70774 100644 --- a/dom/media/hls/HLSDemuxer.cpp +++ b/dom/media/hls/HLSDemuxer.cpp @@ -253,14 +253,14 @@ HLSDemuxer::~HLSDemuxer() { HLS_DEBUG("HLSDemuxer", "~HLSDemuxer()"); mCallbackSupport->Detach(); - if (mJavaCallbacks) { - HLSDemuxerCallbacksSupport::DisposeNative(mJavaCallbacks); - mJavaCallbacks = nullptr; - } if (mHLSDemuxerWrapper) { mHLSDemuxerWrapper->Destroy(); mHLSDemuxerWrapper = nullptr; } + if (mJavaCallbacks) { + HLSDemuxerCallbacksSupport::DisposeNative(mJavaCallbacks); + mJavaCallbacks = nullptr; + } mInitPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__); } diff --git a/dom/media/hls/HLSResource.cpp b/dom/media/hls/HLSResource.cpp index f3130338871b..427c93f3991b 100644 --- a/dom/media/hls/HLSResource.cpp +++ b/dom/media/hls/HLSResource.cpp @@ -100,14 +100,14 @@ HLSResource::~HLSResource() mCallbackSupport->Detach(); mCallbackSupport = nullptr; } - if (mJavaCallbacks) { - HLSResourceCallbacksSupport::DisposeNative(mJavaCallbacks); - mJavaCallbacks = nullptr; - } if (mHLSResourceWrapper) { mHLSResourceWrapper->Destroy(); mHLSResourceWrapper = nullptr; } + if (mJavaCallbacks) { + HLSResourceCallbacksSupport::DisposeNative(mJavaCallbacks); + mJavaCallbacks = nullptr; + } } } // namespace mozilla