From 1cf689a6ad9d6c5cd29e11a6a96cb075eb2bbbb8 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 27 Mar 2022 22:11:07 +0200 Subject: Replaced ThreadSync with stl's mutex --- Stars45/RadioView.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Stars45/RadioView.cpp') diff --git a/Stars45/RadioView.cpp b/Stars45/RadioView.cpp index fe29a5d..8a63091 100644 --- a/Stars45/RadioView.cpp +++ b/Stars45/RadioView.cpp @@ -11,6 +11,8 @@ View class for Radio Communications HUD Overlay */ +#include + #include "RadioView.h" #include "RadioMessage.h" #include "RadioTraffic.h" @@ -35,7 +37,6 @@ #include "Clock.h" #include "ContentBundle.h" #include "Menu.h" -#include "ThreadSync.h" static Color hud_color = Color::Black; static Color txt_color = Color::White; @@ -163,7 +164,7 @@ static bool TargetRequired(const MenuItem* item) // +====================================================================+ RadioView* RadioView::radio_view = 0; -ThreadSync RadioView::sync; +std::mutex RadioView::sync; RadioView::RadioView(Window* c) : View(c), sim(0), ship(0), font(0), dst_elem(0) @@ -601,7 +602,7 @@ RadioView::GetRadioMenu(Ship* s) void RadioView::Message(const char* msg) { - AutoThreadSync a(sync); + const std::lock_guard lock(sync); if (radio_view) { int index = -1; -- cgit v1.1