Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Work around Qt dock restore crash #8135

Merged
merged 1 commit into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion UI/auth-restream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ void RestreamAuth::LoadUI()
main->Config(), service(), "DockState");
QByteArray dockState =
QByteArray::fromBase64(QByteArray(dockStateStr));
main->restoreState(dockState);

if (main->isVisible() || !main->isMaximized())
main->restoreState(dockState);
}

uiLoaded = true;
Expand Down
8 changes: 6 additions & 2 deletions UI/auth-twitch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,9 @@ void TwitchAuth::LoadUI()
main->Config(), service(), "DockState");
QByteArray dockState =
QByteArray::fromBase64(QByteArray(dockStateStr));
main->restoreState(dockState);

if (main->isVisible() || !main->isMaximized())
main->restoreState(dockState);
}

TryLoadSecondaryUIPanes();
Expand Down Expand Up @@ -405,7 +407,9 @@ void TwitchAuth::LoadSecondaryUIPanes()
main->Config(), service(), "DockState");
QByteArray dockState =
QByteArray::fromBase64(QByteArray(dockStateStr));
main->restoreState(dockState);

if (main->isVisible() || !main->isMaximized())
main->restoreState(dockState);
}
}

Expand Down
4 changes: 3 additions & 1 deletion UI/auth-youtube.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ void YoutubeAuth::LoadUI()
main->Config(), service(), "DockState");
QByteArray dockState =
QByteArray::fromBase64(QByteArray(dockStateStr));
main->restoreState(dockState);

if (main->isVisible() || !main->isMaximized())
main->restoreState(dockState);
}
#endif

Expand Down