mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-20 18:40:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WinUpdater: Wait in UI::Init until window is done creating to avoid losing UI::SetVisible signals

Browse Source
This commit is contained in:
Silent 2019-08-05 21:47:53 +02:00
parent f70efbb963
commit 8e79705854
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/WinUpdater/WinUI.cpp
View File

@ -12,6 +12,8 @@
#include <ShObjIdl.h> #include <ShObjIdl.h>
#include <shellapi.h> #include <shellapi.h>
#include "Common/Event.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
namespace namespace
@ -23,6 +25,7 @@ HWND current_progressbar_handle = nullptr;
ITaskbarList3* taskbar_list = nullptr; ITaskbarList3* taskbar_list = nullptr;
std::thread ui_thread; std::thread ui_thread;
Common::Event window_created_event;
int GetWindowHeight(HWND hwnd) int GetWindowHeight(HWND hwnd)
{ {
@ -54,6 +57,9 @@ bool InitWindow()
{ {
InitCommonControls(); InitCommonControls();
// Notify main thread we're done creating the window when we return
Common::ScopeGuard ui_guard{[] { window_created_event.Set(); }};
WNDCLASS wndcl = {}; WNDCLASS wndcl = {};
wndcl.lpfnWndProc = WindowProc; wndcl.lpfnWndProc = WindowProc;
wndcl.hbrBackground = GetSysColorBrush(COLOR_MENU); wndcl.hbrBackground = GetSysColorBrush(COLOR_MENU);
@ -226,6 +232,9 @@ void MessageLoop()
void Init() void Init()
{ {
ui_thread = std::thread(MessageLoop); ui_thread = std::thread(MessageLoop);
// Wait for UI thread to finish creating the window (or at least attempting to)
window_created_event.Wait();
} }
void Stop() void Stop()