From 6cee1278523551dd361aff45267d4f0e008aa5f3 Mon Sep 17 00:00:00 2001
From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com>
Date: Thu, 18 Dec 2025 15:18:54 +0100
Subject: [PATCH] Move clipboard flush to OnExit

Fixes occasional hang on exit
---
 src/gui/wxgui/CemuApp.cpp    | 2 ++
 src/gui/wxgui/MainWindow.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/wxgui/CemuApp.cpp b/src/gui/wxgui/CemuApp.cpp
index 7e6de8ec..0cb47f23 100644
--- a/src/gui/wxgui/CemuApp.cpp
+++ b/src/gui/wxgui/CemuApp.cpp
@@ -24,6 +24,7 @@
 #include <wx/image.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
+#include <wx/clipbrd.h>
 #include "wxHelper.h"
 
 #include "Cafe/TitleList/TitleList.h"
@@ -389,6 +390,7 @@ bool CemuApp::OnInit()
 int CemuApp::OnExit()
 {
 	wxApp::OnExit();
+	wxTheClipboard->Flush();
 #if BOOST_OS_WINDOWS
 	ExitProcess(0);
 #else
diff --git a/src/gui/wxgui/MainWindow.cpp b/src/gui/wxgui/MainWindow.cpp
index 549f7c1a..b69293f2 100644
--- a/src/gui/wxgui/MainWindow.cpp
+++ b/src/gui/wxgui/MainWindow.cpp
@@ -5,7 +5,6 @@
 #include "wxgui/MainWindow.h"
 
 #include <wx/mstream.h>
-#include <wx/clipbrd.h>
 
 #include "wxgui/GameUpdateWindow.h"
 #include "wxgui/PadViewFrame.h"
@@ -442,7 +441,6 @@ wxString MainWindow::GetInitialWindowTitle()
 
 void MainWindow::OnClose(wxCloseEvent& event)
 {
-	wxTheClipboard->Flush();
 
 	if(m_game_list)
 		m_game_list->OnClose(event);