diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/bootmanager.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d9d2a8a4c..a4b89eed8 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -185,7 +185,7 @@ private: | |||
| 185 | bool do_painting; | 185 | bool do_painting; |
| 186 | }; | 186 | }; |
| 187 | 187 | ||
| 188 | GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) | 188 | GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread) |
| 189 | : QWidget(parent), emu_thread(emu_thread) { | 189 | : QWidget(parent), emu_thread(emu_thread) { |
| 190 | setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") | 190 | setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") |
| 191 | .arg(QString::fromUtf8(Common::g_build_name), | 191 | .arg(QString::fromUtf8(Common::g_build_name), |
| @@ -194,8 +194,7 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) | |||
| 194 | setAttribute(Qt::WA_AcceptTouchEvents); | 194 | setAttribute(Qt::WA_AcceptTouchEvents); |
| 195 | 195 | ||
| 196 | InputCommon::Init(); | 196 | InputCommon::Init(); |
| 197 | connect(this, &GRenderWindow::FirstFrameDisplayed, static_cast<GMainWindow*>(parent), | 197 | connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); |
| 198 | &GMainWindow::OnLoadComplete); | ||
| 199 | } | 198 | } |
| 200 | 199 | ||
| 201 | GRenderWindow::~GRenderWindow() { | 200 | GRenderWindow::~GRenderWindow() { |
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 7f9f8e8e3..5a1ebd0fe 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h | |||
| @@ -114,7 +114,7 @@ class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow { | |||
| 114 | Q_OBJECT | 114 | Q_OBJECT |
| 115 | 115 | ||
| 116 | public: | 116 | public: |
| 117 | GRenderWindow(QWidget* parent, EmuThread* emu_thread); | 117 | GRenderWindow(GMainWindow* parent, EmuThread* emu_thread); |
| 118 | ~GRenderWindow() override; | 118 | ~GRenderWindow() override; |
| 119 | 119 | ||
| 120 | // EmuWindow implementation | 120 | // EmuWindow implementation |