From b61b59ae1b7cd4041ef0a815b7e96537418298c9 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 5 Apr 2022 22:10:15 +0200 Subject: Fixed more potential locking problems in Campaign selection screen --- StarsEx/CmpSelectDlg.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'StarsEx/CmpSelectDlg.h') diff --git a/StarsEx/CmpSelectDlg.h b/StarsEx/CmpSelectDlg.h index 093e21d..ee52425 100644 --- a/StarsEx/CmpSelectDlg.h +++ b/StarsEx/CmpSelectDlg.h @@ -14,7 +14,8 @@ #ifndef CmpSelectDlg_h #define CmpSelectDlg_h -#include +#include +#include #include "Types.h" #include "FormWindow.h" @@ -53,7 +54,7 @@ public: virtual void OnAccept(AWEvent* event); virtual void OnCancel(AWEvent* event); - virtual DWORD LoadProc(); + virtual void LoadProc(); protected: virtual void StartLoadProc(); @@ -76,8 +77,8 @@ protected: Starshatter* stars; Campaign* campaign; int selected_mission; - HANDLE hproc; - std::mutex sync; + std::thread hproc; + std::shared_mutex sync; bool loading; bool loaded; Text load_file; -- cgit v1.1