Skip to content

Commit

Permalink
Merge branch 'meta-dev' into meta
Browse files Browse the repository at this point in the history
  • Loading branch information
mrFq1 committed Jan 2, 2024
2 parents 78f15d7 + a96cf7f commit dc8217a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: robinraju/[email protected]
with:
repository: 'MetaCubeX/mihomo'
tag: "v1.17.0"
tag: "v1.18.0"
fileName: ".*darwin.*64-v.*.gz"

# releaseId: "62870807"
Expand Down
9 changes: 7 additions & 2 deletions ClashX/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
self.tunModeMenuItem.target = self

self.helperStatusTimer?.fire()
Logger.log("Fire helperStatusTimer")
}.disposed(by: disposeBag)
} else {
self.proxySettingMenuItem.target = self
self.tunModeMenuItem.target = self

self.helperStatusTimer?.fire()
Logger.log("Fire helperStatusTimer")
}

Logger.log("Fire helperStatusTimer")


if !PrivilegedHelperManager.shared.isHelperCheckFinished.value &&
Expand Down

0 comments on commit dc8217a

Please sign in to comment.