fix crash bug.

hecomi · May 4, 2021 · 83646bd · 83646bd
1 parent 1f3a19d
commit 83646bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.cpp b/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.cpp
@@ -210,7 +210,7 @@ void WindowsGraphicsCapture::DestroyPoolAndSession()
 
 WindowsGraphicsCapture::~WindowsGraphicsCapture()
 {
-    Stop();
+    Stop(false);
 }
 
 
@@ -237,7 +237,7 @@ void WindowsGraphicsCapture::RequestStop()
 }
 
 
-void WindowsGraphicsCapture::Stop()
+void WindowsGraphicsCapture::Stop(bool removeFromManager)
 {
     hasStopRequested_ = false;
     stopTimer_ = 0.f;
@@ -247,9 +247,12 @@ void WindowsGraphicsCapture::Stop()
 
     DestroyPoolAndSession();
 
-    if (const auto& manager = WindowManager::GetWindowsGraphicsCaptureManager())
+    if (removeFromManager)
     {
-        manager->Remove(shared_from_this());
+        if (const auto& manager = WindowManager::GetWindowsGraphicsCaptureManager())
+        {
+            manager->Remove(shared_from_this());
+        }
     }
 }
 

diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.h b/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.h
@@ -39,7 +39,7 @@ class WindowsGraphicsCapture
     void SetCallback(const Callback& callback) { callback_ = callback; }
     void Start();
     void RequestStop();
-    void Stop();
+    void Stop(bool removeFromManager = true);
     bool ShouldStop() const;
     bool IsSessionRestartRequested() const { return isSessionRestartRequested_; }
     void Restart();