diff --git a/UI/window-dock-youtube-app.cpp b/UI/window-dock-youtube-app.cpp index 498a68a057597d..2a5e28beb2ff14 100644 --- a/UI/window-dock-youtube-app.cpp +++ b/UI/window-dock-youtube-app.cpp @@ -33,22 +33,13 @@ static constexpr const char *INGESTION_STOPPED = "INGESTION_STOPPED"; YouTubeAppDock::YouTubeAppDock(const QString &title) : BrowserDock(title), - dockBrowser(nullptr), - cookieManager(nullptr) + dockBrowser(nullptr) { cef->init_browser(); OBSBasic::InitBrowserPanelSafeBlock(); AddYouTubeAppDock(); } -YouTubeAppDock::~YouTubeAppDock() -{ - if (cookieManager) { - cookieManager->FlushStore(); - delete cookieManager; - } -} - bool YouTubeAppDock::IsYTServiceSelected() { if (!cef_js_avail) @@ -78,9 +69,12 @@ void YouTubeAppDock::SettingsUpdated(bool cleanup) // definitely cleanup if YT switched off if (!ytservice || cleanup) { - if (cookieManager) - cookieManager->DeleteCookies("", ""); + if (panel_cookies) { + panel_cookies->DeleteCookies("youtube.com", ""); + panel_cookies->DeleteCookies("google.com", ""); + } } + if (ytservice) Update(); } @@ -135,16 +129,9 @@ void YouTubeAppDock::AddYouTubeAppDock() void YouTubeAppDock::CreateBrowserWidget(const std::string &url) { - std::string dir_name = std::string("obs_profile_cookies_youtube/") + - config_get_string(OBSBasic::Get()->Config(), - "Panels", "CookieId"); - if (cookieManager) - delete cookieManager; - cookieManager = cef->create_cookie_manager(dir_name, true); - if (dockBrowser) delete dockBrowser; - dockBrowser = cef->create_widget(this, url, cookieManager); + dockBrowser = cef->create_widget(this, url, panel_cookies); if (!dockBrowser) return; diff --git a/UI/window-dock-youtube-app.hpp b/UI/window-dock-youtube-app.hpp index f09544fa1e1925..ab47de4a2ddb58 100644 --- a/UI/window-dock-youtube-app.hpp +++ b/UI/window-dock-youtube-app.hpp @@ -11,7 +11,6 @@ class YouTubeAppDock : public BrowserDock { public: YouTubeAppDock(const QString &title); - ~YouTubeAppDock(); enum streaming_mode_t { YTSM_ACCOUNT, YTSM_STREAM_KEY }; @@ -49,5 +48,4 @@ class YouTubeAppDock : public BrowserDock { QString channelId; QPointer dockBrowser; - QCefCookieManager *cookieManager; // is not a Qt object };