fix: Graphics Capture 更早还原源窗口样式

Blinue · Mar 3, 2023 · 9aae602 · 9aae602
1 parent 7d9d8d9
commit 9aae602
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Magpie.App/Resources.language-zh-Hans.resw b/src/Magpie.App/Resources.language-zh-Hans.resw
@@ -724,7 +724,7 @@
     <value>启用便携模式</value>
   </data>
   <data name="Settings_DeveloperOptions.Description" xml:space="preserve">
-    <value>These settings are for development use only</value>
+    <value>这些设置仅供开发使用</value>
   </data>
   <data name="Settings_DeveloperOptions.Title" xml:space="preserve">
     <value>开发者选项</value>

diff --git a/src/Magpie.Core/GraphicsCaptureFrameSource.cpp b/src/Magpie.Core/GraphicsCaptureFrameSource.cpp
@@ -187,6 +187,16 @@ bool GraphicsCaptureFrameSource::_CaptureWindow(IGraphicsCaptureItemInterop* int
 		Logger::Get().Error("创建 ITaskbarList 失败");
 	}
 
+	// 上面的尝试失败了则还原更改
+	if (_taskbarList) {
+		_taskbarList->DeleteTab(hwndSrc);
+		_taskbarList = nullptr;
+	}
+	if (_originalSrcWndExStyle) {
+		SetWindowLongPtr(hwndSrc, GWL_EXSTYLE, _originalSrcWndExStyle);
+		_originalSrcWndExStyle = 0;
+	}
+
 	return false;
 }