From 3447ebcec0580f8a00179f3bb6e9c472db812cb2 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2019 15:52:07 -0700
Subject: [PATCH 1/5] Reload data after a batch update. Fix #872.

---
 Mac/MainWindow/Sidebar/SidebarViewController.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift
index 1a8636780..a14fe0dba 100644
--- a/Mac/MainWindow/Sidebar/SidebarViewController.swift
+++ b/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()
 		}
 	}
 

From cc7321e936f8ad13e652865e17647a7db10f891c Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2019 16:22:06 -0700
Subject: [PATCH 2/5] Center the preferences window. Fix #769.

---
 Mac/Preferences/PreferencesWindowController.swift | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift
index 2ed8628c9..1799eb61b 100644
--- a/Mac/Preferences/PreferencesWindowController.swift
+++ b/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] = {
@@ -50,9 +49,8 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 
 		window?.showsToolbarButton = false
 		window?.toolbar = toolbar
+		window?.center()
 
-		window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName))
-		
 		switchToViewAtIndex(0)
 	}
 

From 4bead42b5ae5cf3e67b97633f3bc168ebd6c5349 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2019 18:30:14 -0700
Subject: [PATCH 3/5] Center prefs window after switching to the proper view.

---
 Mac/Preferences/PreferencesWindowController.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift
index 1799eb61b..d8ae463bc 100644
--- a/Mac/Preferences/PreferencesWindowController.swift
+++ b/Mac/Preferences/PreferencesWindowController.swift
@@ -49,9 +49,10 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 
 		window?.showsToolbarButton = false
 		window?.toolbar = toolbar
-		window?.center()
 
 		switchToViewAtIndex(0)
+
+		window?.center()
 	}
 
 	// MARK: Actions

From dd62a3325ad714c8e8e7e12b0da95b3c4e355258 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2019 18:30:28 -0700
Subject: [PATCH 4/5] Center the main window on first run.

---
 Mac/AppDelegate.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index 3c1dd932c..53a823fcb 100644
--- a/Mac/AppDelegate.swift
+++ b/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)

From 739eb5183ee7727c3fc7eb85d8136661a485675f Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2019 18:31:04 -0700
Subject: [PATCH 5/5] Bump version and build numbers.

---
 Mac/Resources/Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist
index 230c42b35..d6d1f694e 100644
--- a/Mac/Resources/Info.plist
+++ b/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>