Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/UserInterfaceState.xcuserstate
	LiquipediaMenu/StatusBarController.swift
This commit is contained in:
Felix Förtsch
2018-10-15 09:34:40 +02:00
committed by Felix Förtsch
2 changed files with 7 additions and 14 deletions
+2 -1
View File
@@ -9,12 +9,13 @@
import Cocoa
class StatusBarController: NSObject, NSMenuItemValidation {
func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
return true
}
let statusBar = NSMenu()
let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
let statusBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
let matchesAPI = MatchesAPI()
var matches = [Match]()