Merge branch 'mac-candidate'

Mac/AppDelegate.swift

@@ -146,6 +146,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 
 		updateSortMenuItems()
         createAndShowMainWindow()
+		if isFirstRun {
+			mainWindowController?.window?.center()
+		}
 
 		NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)

Mac/MainWindow/Sidebar/SidebarViewController.swift

@@ -363,9 +363,8 @@ private extension SidebarViewController {
 
 	func rebuildTreeAndReloadDataIfNeeded() {
 		if !animatingChanges && !BatchUpdate.shared.isPerforming {
-			if treeController.rebuild() {
-				outlineView.reloadData()
-			}
+			treeController.rebuild()
+			outlineView.reloadData()
 		}
 	}
 

Mac/Preferences/PreferencesWindowController.swift

@@ -29,7 +29,6 @@ private struct ToolbarItemIdentifier {
 
 class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 	
-	private let windowFrameName = "Preferences"
 	private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes
 	private var viewControllers = [String: NSViewController]()
 	private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = {
@@ -51,9 +50,9 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 		window?.showsToolbarButton = false
 		window?.toolbar = toolbar
 
-		window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName))
-		
 		switchToViewAtIndex(0)
+
+		window?.center()
 	}
 
 	// MARK: Actions

Mac/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0b5</string>
+	<string>5.0b6</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -33,7 +33,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2607</string>
+	<string>2608</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>