OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix YouTubeAppDock restore dock state

Browse source
This commit is contained in:
tytan652 2023-08-04 09:20:11 +02:00 committed by Lain
parent 57849bb0e7
commit 049f4454d4
3 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UI/auth-youtube.cpp
View file

@ -174,7 +174,12 @@ void YoutubeAuth::LoadUI()
if (firstLoad) {
chat->setVisible(true);
} else {
}
#endif
main->NewYouTubeAppDock();
if (!firstLoad) {
const char *dockStateStr = config_get_string(
main->Config(), service(), "DockState");
QByteArray dockState =
@ -183,7 +188,6 @@ void YoutubeAuth::LoadUI()
if (main->isVisible() || !main->isMaximized())
main->restoreState(dockState);
}
#endif
uiLoaded = true;
}

12
UI/window-basic-main.cpp
View file

@ -2192,6 +2192,12 @@ void OBSBasic::OBSInit()
}
#endif
#ifdef YOUTUBE_ENABLED
/* setup YouTube app dock */
if (YouTubeAppDock::IsYTServiceSelected())
youtubeAppDock = new YouTubeAppDock();
#endif
const char *dockStateStr = config_get_string(
App()->GlobalConfig(), "BasicWindow", "DockState");
@ -2336,12 +2342,6 @@ void OBSBasic::OBSInit()
UpdatePreviewProgramIndicators();
OnFirstLoad();
#ifdef YOUTUBE_ENABLED
/* setup YouTube app dock */
if (YouTubeAppDock::IsYTServiceSelected())
youtubeAppDock = new YouTubeAppDock();
#endif
if (!hideWindowOnStart)
activateWindow();

9
UI/window-dock-youtube-app.cpp
View file

@ -127,15 +127,6 @@ void YouTubeAppDock::AddYouTubeAppDock(const QString &title)
if (IsYTServiceSelected()) {
const std::string url = InitYTUserUrl();
CreateBrowserWidget(url);
// reload panel layout
const char *dockStateStr = config_get_string(
App()->GlobalConfig(), "BasicWindow", "DockState");
if (dockStateStr) {
QByteArray dockState = QByteArray::fromBase64(
QByteArray(dockStateStr));
OBSBasic::Get()->restoreState(dockState);
}
} else {
this->setVisible(false);
this->toggleViewAction()->setVisible(false);