Skip to content

Fix to avoid lastEnableArguments to be set to null due to cancelOnLeavePiP call #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dev-aman wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix to avoid lastEnableArguments to be set to null due to cancelOnLeavePiP call #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db3eb76
Fix to avoid lastEnableArguments to be set to null due to cancelOnLea…
aman-junglee-games Jul 15, 2025
e2194d2
Update exception handling for cancelOnLeavePiP
aman-junglee-games Jul 16, 2025
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
8 changes: 6 additions & 2 deletions lib/src/floating.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ class Floating {
///
/// Note: this will not make any effect on Android SDK older than 26.
Future<PiPStatus> enable(EnableArguments arguments) async {
lastEnableArguments = arguments;
final (aspectRatio, sourceRectHint, autoEnable) = switch (arguments) {
ImmediatePiP(:final aspectRatio, :final sourceRectHint) => (
aspectRatio,
Expand All @@ -138,7 +137,12 @@ class Floating {
// Cancel any previous settings in case it would interfere with the
// current ones, e.g. current one is ImmediatePiP but OnLeavePiP
// was called before.
await cancelOnLeavePiP();
try {
await cancelOnLeavePiP();
} finally {
// Ensure lastEnableArguments is always set, even if cancelOnLeavePiP throws.
lastEnableArguments = arguments;
}
final bool? enabledSuccessfully = await _channel.invokeMethod(
'enablePip',
{
Expand Down