Permalink
Browse files

Qt: Fix render widget not being on top when using -n / -e

  • Loading branch information...
spycrab committed May 13, 2018
1 parent 99dff10 commit fa77e092397abd44bcd7f7bed8ba725510cb2a37
Showing with 16 additions and 2 deletions.
  1. +1 −1 Source/Core/DolphinQt2/Main.cpp
  2. +13 −1 Source/Core/DolphinQt2/MainWindow.cpp
  3. +2 −0 Source/Core/DolphinQt2/MainWindow.h
@@ -180,7 +180,7 @@ int main(int argc, char* argv[])
MainWindow win{std::move(boot)};
if (options.is_set("debugger"))
Settings::Instance().SetDebugModeEnabled(true);
win.show();
win.Show();
#if defined(USE_ANALYTICS) && USE_ANALYTICS
if (!SConfig::GetInstance().m_analytics_permission_asked)
@@ -110,7 +110,7 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainW
NetPlayInit();
if (boot_parameters)
StartGame(std::move(boot_parameters));
m_pending_boot = std::move(boot_parameters);
QSettings& settings = Settings::GetQSettings();
@@ -1351,3 +1351,15 @@ void MainWindow::OnUpdateProgressDialog(QString title, int progress, int total)
m_progress_dialog = nullptr;
}
}
void MainWindow::Show()
{
QWidget::show();
// If the booting of a game was requested on start up, do that now
if (m_pending_boot != nullptr)
{
StartGame(std::move(m_pending_boot));
m_pending_boot.reset();
}
}
@@ -58,6 +58,8 @@ class MainWindow final : public QMainWindow
explicit MainWindow(std::unique_ptr<BootParameters> boot_parameters);
~MainWindow();
void Show();
bool eventFilter(QObject* object, QEvent* event) override;
signals:

0 comments on commit fa77e09

Please sign in to comment.