diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-05-31 20:00:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 20:00:37 +0200 |
| commit | 0e6db0720318ad019e2720cac6ef5fb76876df8b (patch) | |
| tree | 8f8a31276990d1b0e427727cf08458ef5cb728d3 /Source | |
| parent | 171596ac741008d05529e237033dc2977533dec0 (diff) | |
| parent | 564d4c3c2519b0c2cb5dd66d1411719dfb5f4551 (diff) | |
Merge pull request #12794 from TryTwo/PR_Windows_Initialize_Fix
MainWindow, Bugfix: Initialize geometries before calling GetWindowSystemInfo
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index c8e04a0fd0..95343b12f1 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -227,8 +227,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters, setAcceptDrops(true); setAttribute(Qt::WA_NativeWindow); - InitControllers(); - CreateComponents(); ConnectGameList(); @@ -237,6 +235,13 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters, ConnectRenderWidget(); ConnectStack(); ConnectMenuBar(); + + QSettings& settings = Settings::GetQSettings(); + restoreState(settings.value(QStringLiteral("mainwindow/state")).toByteArray()); + restoreGeometry(settings.value(QStringLiteral("mainwindow/geometry")).toByteArray()); + show(); + + InitControllers(); ConnectHotkeys(); #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) @@ -289,11 +294,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters, m_state_slot = std::clamp(Settings::Instance().GetStateSlot(), 1, static_cast<int>(State::NUM_STATES)); - QSettings& settings = Settings::GetQSettings(); - - restoreState(settings.value(QStringLiteral("mainwindow/state")).toByteArray()); - restoreGeometry(settings.value(QStringLiteral("mainwindow/geometry")).toByteArray()); - m_render_widget_geometry = settings.value(QStringLiteral("renderwidget/geometry")).toByteArray(); // Restoring of window states can sometimes go wrong, resulting in widgets being visible when they |