Merge pull request #14 from v-ken/quicksearch

Ensure that the search results matches the current search term
zhuorantan · Sep 14, 2016 · e1d6ff2 · e1d6ff2
2 parents 306b305 + 0f892d5
commit e1d6ff2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/LocationPicker/LocationPicker.swift b/LocationPicker/LocationPicker.swift
@@ -866,6 +866,10 @@ extension LocationPicker: UISearchBarDelegate {
                 localSearchRequest.region = MKCoordinateRegionMakeWithDistance(defaultSearchCoordinate, searchDistance, searchDistance)
             }
             MKLocalSearch(request: localSearchRequest).startWithCompletionHandler({ (localSearchResponse, error) -> Void in
+                guard searchText == searchBar.text else {
+                    // Ensure that the result is valid for the most recent searched text
+                    return
+                }
                 guard error == nil,
                     let localSearchResponse = localSearchResponse where localSearchResponse.mapItems.count > 0 else {
                         if self.allowArbitraryLocation {