Merge branch 'dev'

* dev: bump version fix: observer of search progress lives longer than its observance
ddddxxx · Apr 27, 2018 · 0b8ae6b · 0b8ae6b
2 parents 32122c2 + 282f44e
commit 0b8ae6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/LyricsX/Controller/SearchLyricsViewController.swift b/LyricsX/Controller/SearchLyricsViewController.swift
@@ -78,6 +78,7 @@ class SearchLyricsViewController: NSViewController, NSTableViewDelegate, NSTable
 
     @IBAction func searchAction(_ sender: Any?) {
         searchTask?.cancel()
+        progressObservation?.invalidate()
         searchResult = []
         artworkView.image = #imageLiteral(resourceName: "missing_artwork")
         lyricsPreviewTextView.string = " "
@@ -103,6 +104,7 @@ class SearchLyricsViewController: NSViewController, NSTableViewDelegate, NSTable
                 self?.progressIndicator.doubleValue = fractionCompleted
                 if fractionCompleted == 1 {
                     self?.progressIndicator.isHidden = true
+                    self?.progressObservation?.invalidate()
                 }
             }
         }

diff --git a/LyricsX/Supporting Files/Info.plist b/LyricsX/Supporting Files/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.3.1-beta</string>
 	<key>CFBundleVersion</key>
-	<string>1690</string>
+	<string>1691</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>