Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sxitch/Core/RunningApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,18 @@ struct RunningApp: SwitchableApp, Equatable {
return app
}

let filtered = processed.filter { app in
app.app.activationPolicy == .regular
&& (!blacklist.contains(app.appName.lowercased()) || !usState.isPro)
}

var nameCounts: [String: Int] = [:]
for app in processed {
for app in filtered {
nameCounts[app.appName.lowercased(), default: 0] += 1
}

var nameCounters: [String: Int] = [:]
let deduped = processed.map { app -> RunningApp in
let deduped = filtered.map { app -> RunningApp in
var app = app
let key = app.appName.lowercased()
if nameCounts[key]! > 1 {
Expand All @@ -70,12 +75,7 @@ struct RunningApp: SwitchableApp, Equatable {
return app
}

return deduped
.filter { app in
app.app.activationPolicy == .regular
&& (!blacklist.contains(app.appName.lowercased()) || !usState.isPro)
}
.sorted { $0.appName < $1.appName }
return deduped.sorted { $0.appName < $1.appName }
}

func performAction(action: AppMode) {
Expand Down
Loading