Fix leaky announcement timer (#628)

mapbox · Sep 19, 2017 · d1abeb1 · d1abeb1
1 parent 16312c8
commit d1abeb1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/MapboxNavigation/RouteVoiceController.swift b/MapboxNavigation/RouteVoiceController.swift
@@ -16,7 +16,7 @@ open class RouteVoiceController: NSObject, AVSpeechSynthesizerDelegate, AVAudioP
     let routeStepFormatter = RouteStepFormatter()
     var recentlyAnnouncedRouteStep: RouteStep?
     var fallbackText: String!
-    var announcementTimer: Timer!
+    var announcementTimer: Timer?
 
     /**
      A boolean value indicating whether instructions should be announced by voice or not.
@@ -80,6 +80,7 @@ open class RouteVoiceController: NSObject, AVSpeechSynthesizerDelegate, AVAudioP
     deinit {
         suspendNotifications()
         speechSynth.stopSpeaking(at: .word)
+        resetAnnouncementTimer()
     }
 
     func resumeNotifications() {
@@ -148,12 +149,13 @@ open class RouteVoiceController: NSObject, AVSpeechSynthesizerDelegate, AVAudioP
     }
 
     func startAnnouncementTimer() {
+        announcementTimer?.invalidate()
         announcementTimer = Timer.scheduledTimer(timeInterval: bufferBetweenAnnouncements, target: self, selector: #selector(resetAnnouncementTimer), userInfo: nil, repeats: false)
     }
 
     func resetAnnouncementTimer() {
+        announcementTimer?.invalidate()
         recentlyAnnouncedRouteStep = nil
-        announcementTimer.invalidate()
     }
 
     open func alertLevelDidChange(notification: NSNotification) {