[update] イベント処理を修正

並びが変わってなかったので、データの受け渡し修正
Cilda · Aug 29, 2024 · 1b24d5d · 1b24d5d
1 parent e220b71
commit 1b24d5d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/UmaUmaChecker/src/Recognizer/Uma.cpp b/UmaUmaChecker/src/Recognizer/Uma.cpp
@@ -155,9 +155,11 @@ void Uma::MonitorThread()
 
 					image->GetHBITMAP(Gdiplus::Color(0, 0, 0), &hBmp);
 
+					UmaThreadData data = { event, hBmp };
+
 					wxThreadEvent event(wxEVT_THREAD);
 					event.SetId(1);
-					event.SetPayload(hBmp);
+					event.SetPayload(data);
 					wxQueueEvent(frame, event.Clone());
 				}
 			}

diff --git a/UmaUmaChecker/src/Recognizer/Uma.h b/UmaUmaChecker/src/Recognizer/Uma.h
@@ -18,6 +18,12 @@
 
 class Uma
 {
+public:
+	struct UmaThreadData {
+		std::shared_ptr<EventSource> event;
+		HBITMAP hBitmap;
+	};
+
 public:
 	Uma(wxFrame* frame);
 	~Uma();

diff --git a/UmaUmaChecker/src/UI/MainFrame.cpp b/UmaUmaChecker/src/UI/MainFrame.cpp
@@ -411,19 +411,19 @@ void MainFrame::OnSelectedUma(wxCommandEvent& event)
 void MainFrame::OnUmaThreadEvent(wxThreadEvent& event)
 {
 	if (event.GetId() == 1) {
-		HBITMAP hBmp = event.GetPayload<HBITMAP>();
+		Uma::UmaThreadData data = event.GetPayload<Uma::UmaThreadData>();
 
-		if (umaMgr->CurrentEvent) {
-			ChangeEventOptions(umaMgr->CurrentEvent);
+		if (data.event) {
+			ChangeEventOptions(data.event.get());
 
 			if (m_PreviewWindow) {
 				BITMAP bmp;
 
-				GetObject(hBmp, sizeof(BITMAP), &bmp);
-				m_PreviewWindow->SetImage(hBmp, bmp.bmWidth, bmp.bmHeight);
+				GetObject(data.hBitmap, sizeof(BITMAP), &bmp);
+				m_PreviewWindow->SetImage(data.hBitmap, bmp.bmWidth, bmp.bmHeight);
 			}
 			else {
-				DeleteObject(hBmp);
+				DeleteObject(data.hBitmap);
 			}
 		}
 	}