From 29101c310b93ebedfc00d4389e9f80379e3b4d77 Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Thu, 2 Apr 2026 14:42:14 +0200
Subject: [PATCH] fix: clean up power-resume timer on dispose and destroy

---
 windows/runner/mpv/mpv_plugin.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/windows/runner/mpv/mpv_plugin.cpp b/windows/runner/mpv/mpv_plugin.cpp
index d74b9b6e..1069862f 100644
--- a/windows/runner/mpv/mpv_plugin.cpp
+++ b/windows/runner/mpv/mpv_plugin.cpp
@@ -57,6 +57,12 @@ MpvPlayerPlugin::MpvPlayerPlugin(flutter::PluginRegistrarWindows* registrar)
 }
 
 MpvPlayerPlugin::~MpvPlayerPlugin() {
+  // Clear power-resume callback and kill pending timer so they cannot
+  // invoke a dangling `this`.
+  if (MpvCore::GetInstance()) {
+    MpvCore::GetInstance()->SetPowerResumeCallback(nullptr);
+    ::KillTimer(GetWindow(), MpvCore::kPowerResumeTimerId);
+  }
   // Unregister window proc delegate.
   if (proc_id_) {
     registrar_->UnregisterTopLevelWindowProcDelegate(proc_id_.value());
@@ -139,6 +145,11 @@ void MpvPlayerPlugin::HandleMethodCall(
       result->Error("INIT_FAILED", "Failed to initialize MPV player");
     }
   } else if (method == "dispose") {
+    // Clear power-resume callback and kill pending timer before disposing.
+    if (MpvCore::GetInstance()) {
+      MpvCore::GetInstance()->SetPowerResumeCallback(nullptr);
+      ::KillTimer(GetWindow(), MpvCore::kPowerResumeTimerId);
+    }
     if (player_) {
       auto hwnd = player_->GetHwnd();
       player_->Dispose();