iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fixes' into feature

This commit is contained in:
arch1t3cht 2023-02-25 12:33:15 +01:00
parent fde3dd0dbf 15d215f36d
commit 798262ff1c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/auto4_lua.cpp
View File

@ -127,7 +127,8 @@ namespace {
const char *clipboard_get() const char *clipboard_get()
{ {
std::string data = GetClipboard(); std::string data;
agi::dispatch::Main().Sync([&] { data = GetClipboard(); });
if (data.empty()) if (data.empty())
return nullptr; return nullptr;
return strndup(data); return strndup(data);
@ -137,18 +138,14 @@ namespace {
{ {
bool succeeded = false; bool succeeded = false;
#if wxUSE_OLE agi::dispatch::Main().Sync([&] {
// OLE needs to be initialized on each thread that wants to write to
// the clipboard, which wx does not handle automatically
wxClipboard cb;
#else
wxClipboard &cb = *wxTheClipboard; wxClipboard &cb = *wxTheClipboard;
#endif
if (cb.Open()) { if (cb.Open()) {
succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str))); succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str)));
cb.Close(); cb.Close();
cb.Flush(); cb.Flush();
} }
});
return succeeded; return succeeded;
} }