diff options
| author | bunnei <bunneidev@gmail.com> | 2019-01-21 14:12:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 14:12:47 -0500 |
| commit | 125599c2d51fba0bb9466d92382631ed7f34bed9 (patch) | |
| tree | a0fc21fcf2d49ff81938f0463cf3a5da4dcd3184 /src/yuzu/main.cpp | |
| parent | 1c733bf175253bbe3f2f7747fe5344e654eff6e0 (diff) | |
| parent | 3049ea45d3f1621e48714022a195f6a2971dce56 (diff) | |
Merge pull request #2038 from jroweboy/loading-progress-bar
Loading progress bar upgrades
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 68bfa23ab..2c3e27c2e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -415,6 +415,13 @@ void GMainWindow::InitializeWidgets() { loading_screen = new LoadingScreen(this); loading_screen->hide(); ui.horizontalLayout->addWidget(loading_screen); + connect(loading_screen, &LoadingScreen::Hidden, [&] { + loading_screen->Clear(); + if (emulation_running) { + render_window->show(); + render_window->setFocus(); + } + }); // Create status bar message_label = new QLabel(); @@ -904,7 +911,6 @@ void GMainWindow::BootGame(const QString& filename) { loading_screen->Prepare(Core::System::GetInstance().GetAppLoader()); loading_screen->show(); - loading_screen->setFocus(); emulation_running = true; if (ui.action_Fullscreen->isChecked()) { @@ -1514,10 +1520,7 @@ void GMainWindow::OnStopGame() { } void GMainWindow::OnLoadComplete() { - loading_screen->hide(); - loading_screen->Clear(); - render_window->show(); - render_window->setFocus(); + loading_screen->OnLoadComplete(); } void GMainWindow::OnMenuReportCompatibility() { |