Make window close independent from back-blocked UI state#2131
Open
chenx-dust wants to merge 1 commit into
Open
Make window close independent from back-blocked UI state#2131chenx-dust wants to merge 1 commit into
chenx-dust wants to merge 1 commit into
Conversation
EyKettle
added a commit
to EyKettle/FlClash
that referenced
this pull request
Jun 29, 2026
Cherry-pick 8 selected PRs fixing critical bugs and security issues: chen08209#2136 fix: new rule overwrites existing rule with duplicate id -1 chen08209#2131 fix: window close blocked by back-blocked UI state chen08209#2103 fix: propagate UID from getConnectionOwnerUid through JNI chen08209#1996 fix: Android :remote process SIGABRT on VPN start chen08209#2018 fix: unsafe malloc() dereference in jni_helper.cpp chen08209#1938 fix: Zip Slip path traversal in backup restore chen08209#2132 fix: Android QR scanning difficulty Additionally: - Custom _fixRules patch for subscription rules missing TARGET field (upstream chen08209#2028 original approach, redesigned for minimal diff) - Switch submodule URLs from SSH to HTTPS for CI compatibility
EyKettle
added a commit
to EyKettle/FlClash
that referenced
this pull request
Jun 30, 2026
Cherry-pick 8 selected PRs fixing critical bugs and security issues: chen08209#2136 fix: new rule overwrites existing rule with duplicate id -1 chen08209#2131 fix: window close blocked by back-blocked UI state chen08209#2103 fix: propagate UID from getConnectionOwnerUid through JNI chen08209#1996 fix: Android :remote process SIGABRT on VPN start chen08209#2018 fix: unsafe malloc() dereference in jni_helper.cpp chen08209#1938 fix: Zip Slip path traversal in backup restore chen08209#2132 fix: Android QR scanning difficulty Additionally: - Custom _fixRules patch for subscription rules missing TARGET field (upstream chen08209#2028 original approach, redesigned for minimal diff) - Switch submodule URLs from SSH to HTTPS for CI compatibility
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题
连接/请求页面进入筛选搜索时会设置
backBlock = true，原来的handleBackOrExit()内部会读取这个状态并直接返回。桌面窗口关闭、标题栏关闭按钮、Ctrl+W也都走handleBackOrExit()，所以搜索态下窗口关闭被误拦截，表现为窗口无法关闭。修复
把
backBlock判断从SystemAction.handleBackOrExit()移到普通系统返回入口HomeBackScopeContainer。这样：CommonPopScope处理搜索/编辑状态，必要时由backBlock阻止继续最小化/退出。Ctrl+W直接执行应用级关闭策略，不再被搜索/编辑态拦住。handleBackOrExit()职责更清晰，只负责根据minimizeOnExit决定隐藏到后台/托盘或真正退出。