ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WinUpdater: Improved exit synchronization on Windows - now joins a thread instead of using flags to signal

This commit is contained in:
Silent 2019-06-24 20:49:18 +02:00
parent 3f1ba830e7
commit d355abaf0c
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@
#include <ShObjIdl.h>
#include <shellapi.h>
#include "Common/Flag.h"
#include "Common/StringUtil.h"
namespace
@ -23,7 +22,7 @@ HWND total_progressbar_handle = nullptr;
HWND current_progressbar_handle = nullptr;
ITaskbarList3* taskbar_list = nullptr;
Common::Flag running;
std::thread ui_thread;
int GetWindowHeight(HWND hwnd)
{
@ -201,12 +200,16 @@ void SetDescription(const std::string& text)
void MessageLoop()
{
running.Set();
if (!InitWindow())
{
running.Clear();
MessageBox(nullptr, L"Window init failed!", L"", MB_ICONERROR);
// Destroying the parent (if exists) destroys all children windows
if (window_handle)
{
DestroyWindow(window_handle);
window_handle = nullptr;
}
return;
}
SetTotalMarquee(true);
@ -218,26 +221,19 @@ void MessageLoop()
TranslateMessage(&msg);
DispatchMessage(&msg);
}
running.Clear();
}
void Init()
{
std::thread thread(MessageLoop);
thread.detach();
ui_thread = std::thread(MessageLoop);
}
void Stop()
{
if (!running.IsSet())
return;
if (window_handle)
PostMessage(window_handle, WM_CLOSE, 0, 0);
PostMessage(window_handle, WM_CLOSE, 0, 0);
while (running.IsSet())
{
}
ui_thread.join();
}
void LaunchApplication(std::string path)