diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-21 21:16:48 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-21 21:16:48 -0400 |
| commit | ca5ea5142deec687e42f86add5026c1ade2c1093 (patch) | |
| tree | 62940e905ce6eae0b15249482ff62e12dfc33e6d /src/citra_qt/bootmanager.h | |
| parent | b58a48d7964a30d3c334a7eaf41c658579c37638 (diff) | |
| parent | 541fc80240440f73c6d83650d938991a77995b97 (diff) | |
Merge pull request #1106 from Kloen/fix-connect
citra-qt: Fix connect error on startup (#449)
Diffstat (limited to 'src/citra_qt/bootmanager.h')
| -rw-r--r-- | src/citra_qt/bootmanager.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index dc422358e..2fd611367 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -123,13 +123,12 @@ public: void OnClientAreaResized(unsigned width, unsigned height); - void OnFramebufferSizeChanged(); - public slots: void moveContext(); // overridden void OnEmulationStarting(EmuThread* emu_thread); void OnEmulationStopping(); + void OnFramebufferSizeChanged(); signals: /// Emitted when the window is closed @@ -146,4 +145,7 @@ private: int keyboard_id; EmuThread* emu_thread; + +protected: + void showEvent(QShowEvent* event) override; }; |
