From e223c98b0dfc5462f488ff2ef8c1c19d74ade08b Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 21 Jul 2021 16:36:05 +0200 Subject: [PATCH] Remove XEmbed testing todo Still seems to work 'fine' (as in, not really). --- src/wine-host/bridges/vst3.cpp | 9 +++++---- src/wine-host/editor.cpp | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp index f498fbf4..71eb5017 100644 --- a/src/wine-host/bridges/vst3.cpp +++ b/src/wine-host/bridges/vst3.cpp @@ -777,14 +777,15 @@ void Vst3Bridge::run() { }, [&](const YaPlugView::Removed& request) -> YaPlugView::Removed::Response { + Vst3PluginInstance& instance = + object_instances.at(request.owner_instance_id); + return main_context .run_in_context([&]() -> tresult { // Cleanup is handled through RAII const tresult result = - object_instances.at(request.owner_instance_id) - .plug_view_instance->plug_view->removed(); - object_instances.at(request.owner_instance_id) - .editor.reset(); + instance.plug_view_instance->plug_view->removed(); + instance.editor.reset(); return result; }) diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp index 068a13b5..a3f339d3 100644 --- a/src/wine-host/editor.cpp +++ b/src/wine-host/editor.cpp @@ -884,8 +884,6 @@ void Editor::do_xembed() const { return; } - // TODO: Test if XEmbed still works, or if it maybe works better now - // If we're embedding using XEmbed, then we'll have to go through the whole // XEmbed dance here. See the spec for more information on how this works: // https://specifications.freedesktop.org/xembed-spec/xembed-spec-latest.html#lifecycle