mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fixes' into feature

Browse source
This commit is contained in:
arch1t3cht 2023-02-25 12:33:15 +01:00
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

23
src/auto4_lua.cpp
View file

@ -127,7 +127,8 @@ namespace {
const char *clipboard_get()
{
std::string data = GetClipboard();
std::string data;
agi::dispatch::Main().Sync([&] { data = GetClipboard(); });
if (data.empty())
return nullptr;
return strndup(data);
@ -137,18 +138,14 @@ namespace {
{
bool succeeded = false;
#if wxUSE_OLE
// 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;
#endif
if (cb.Open()) {
succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str)));
cb.Close();
cb.Flush();
}
agi::dispatch::Main().Sync([&] {
wxClipboard &cb = *wxTheClipboard;
if (cb.Open()) {
succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str)));
cb.Close();
cb.Flush();
}
});
return succeeded;
}