From b2fb39b67ffa76b2eac663d84df9bbca5dedbc55 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 23 Jul 2012 00:44:47 +0000
Subject: [PATCH] Fix leak of the Indexer when an audio/video file has already
 been indexed

Originally committed to SVN as r6940.
---
 aegisub/src/audio_provider_ffmpegsource.cpp | 3 +++
 aegisub/src/video_provider_ffmpegsource.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 687388c09..8d474c621 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -143,6 +143,9 @@ void FFmpegSourceAudioProvider::LoadAudio(wxString filename) {
 		if (TrackNumber == FFMS_TRACKMASK_ALL)
 			TrackNumber = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_AUDIO, &ErrInfo);
 	}
+	else {
+		FFMS_CancelIndexing(Indexer);
+	}
 
 	// update access time of index file so it won't get cleaned away
 	if (!wxFileName(CacheName).Touch()) {
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index cddfdf79b..f131a773b 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -132,6 +132,9 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) {
 			TrackMask = FFMS_TRACKMASK_ALL;
 		Index = DoIndexing(Indexer, CacheName, TrackMask, GetErrorHandlingMode());
 	}
+	else {
+		FFMS_CancelIndexing(Indexer);
+	}
 
 	// update access time of index file so it won't get cleaned away
 	wxFileName(CacheName).Touch();