Don't show render window until a game is started
This commit is contained in:
parent
7134a17fc6
commit
afd06675fa
|
@ -266,6 +266,7 @@ void GMainWindow::BootGame(const std::string& filename) {
|
|||
callstackWidget->OnDebugModeEntered();
|
||||
render_window->show();
|
||||
|
||||
emulation_running = true;
|
||||
OnStartGame();
|
||||
}
|
||||
|
||||
|
@ -294,6 +295,8 @@ void GMainWindow::ShutdownGame() {
|
|||
ui.action_Pause->setEnabled(false);
|
||||
ui.action_Stop->setEnabled(false);
|
||||
render_window->hide();
|
||||
|
||||
emulation_running = false;
|
||||
}
|
||||
|
||||
void GMainWindow::StoreRecentFile(const QString& filename)
|
||||
|
@ -423,17 +426,21 @@ void GMainWindow::ToggleWindowMode() {
|
|||
// Render in the main window...
|
||||
render_window->BackupGeometry();
|
||||
ui.horizontalLayout->addWidget(render_window);
|
||||
render_window->setVisible(true);
|
||||
render_window->setFocusPolicy(Qt::ClickFocus);
|
||||
if (emulation_running) {
|
||||
render_window->setVisible(true);
|
||||
render_window->setFocus();
|
||||
}
|
||||
|
||||
} else {
|
||||
// Render in a separate window...
|
||||
ui.horizontalLayout->removeWidget(render_window);
|
||||
render_window->setParent(nullptr);
|
||||
render_window->setFocusPolicy(Qt::NoFocus);
|
||||
if (emulation_running) {
|
||||
render_window->setVisible(true);
|
||||
render_window->RestoreGeometry();
|
||||
render_window->setFocusPolicy(Qt::NoFocus);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -102,6 +102,8 @@ private:
|
|||
|
||||
GRenderWindow* render_window;
|
||||
|
||||
// Whether emulation is currently running in Citra.
|
||||
bool emulation_running = false;
|
||||
std::unique_ptr<EmuThread> emu_thread;
|
||||
|
||||
ProfilerWidget* profilerWidget;
|
||||
|
|
Reference in New Issue