Skip to content

Commit

Permalink
Merge release/1.85.0 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daxmobile authored Apr 25, 2024
2 parents d063311 + e9577f6 commit b71ef58
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 174
CURRENT_PROJECT_VERSION = 175
5 changes: 3 additions & 2 deletions DuckDuckGo/DBP/DBPHomeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ final class DBPHomeViewController: NSViewController {

override func viewDidLayout() {
super.viewDidLayout()
dataBrokerProtectionViewController.view.frame = view.bounds
errorViewController.view.frame = view.bounds
if let currentChildViewController = currentChildViewController {
currentChildViewController.view.frame = view.bounds
}
}

private func setupUI() {
Expand Down
4 changes: 3 additions & 1 deletion DuckDuckGo/Menus/HistoryMenu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ final class HistoryMenu: NSMenu {
reopenLastClosedMenuItem
recentlyClosedMenuItem
reopenAllWindowsFromLastSessionMenuItem
NSMenuItem.separator()

clearAllHistorySeparator
clearAllHistoryMenuItem
}

reopenMenuItemKeyEquivalentManager.reopenLastClosedMenuItem = reopenLastClosedMenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ final class DataBrokerOperationsCollection: Operation {
try await Task.sleep(nanoseconds: UInt64(sleepInterval) * 1_000_000_000)
}

finish()

} catch {
os_log("Error: %{public}@", log: .dataBrokerProtection, error.localizedDescription)
self.error = error
Expand All @@ -203,6 +201,8 @@ final class DataBrokerOperationsCollection: Operation {
withDataBrokerName: brokerProfileQueriesData.first?.dataBroker.name)
}
}

finish()
}

private func finish() {
Expand Down

0 comments on commit b71ef58

Please sign in to comment.