Skip to content

Commit 6cee127

Browse files
committed
Move clipboard flush to OnExit
Fixes occasional hang on exit
1 parent 0ddcba4 commit 6cee127

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/gui/wxgui/CemuApp.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <wx/image.h>
2525
#include <wx/filename.h>
2626
#include <wx/stdpaths.h>
27+
#include <wx/clipbrd.h>
2728
#include "wxHelper.h"
2829

2930
#include "Cafe/TitleList/TitleList.h"
@@ -389,6 +390,7 @@ bool CemuApp::OnInit()
389390
int CemuApp::OnExit()
390391
{
391392
wxApp::OnExit();
393+
wxTheClipboard->Flush();
392394
#if BOOST_OS_WINDOWS
393395
ExitProcess(0);
394396
#else

src/gui/wxgui/MainWindow.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "wxgui/MainWindow.h"
66

77
#include <wx/mstream.h>
8-
#include <wx/clipbrd.h>
98

109
#include "wxgui/GameUpdateWindow.h"
1110
#include "wxgui/PadViewFrame.h"
@@ -442,7 +441,6 @@ wxString MainWindow::GetInitialWindowTitle()
442441

443442
void MainWindow::OnClose(wxCloseEvent& event)
444443
{
445-
wxTheClipboard->Flush();
446444

447445
if(m_game_list)
448446
m_game_list->OnClose(event);

0 commit comments

Comments
 (0)