Browse Source

Windows: Fixed a crash when calling DragAndDropContainer::performExternalDragDropOfFiles()

tags/2021-05-28
ed 6 years ago
parent
commit
67e6bc65a9
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp

+ 5
- 5
modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp View File

@@ -243,10 +243,10 @@ namespace DragAndDropHelpers
struct DragAndDropJob : public ThreadPoolJob
{
DragAndDropJob (FORMATETC f, STGMEDIUM m, DWORD d, std::function<void()> cb)
DragAndDropJob (FORMATETC f, STGMEDIUM m, DWORD d, std::function<void()>&& cb)
: ThreadPoolJob ("DragAndDrop"),
format (f), medium (m), whatToDo (d),
completionCallback (cb)
completionCallback (std::move (cb))
{
}
@@ -266,7 +266,7 @@ namespace DragAndDropHelpers
OleUninitialize();
if (completionCallback != nullptr)
MessageManager::callAsync (completionCallback);
MessageManager::callAsync (std::move (completionCallback));
return jobHasFinished;
}
@@ -317,7 +317,7 @@ bool DragAndDropContainer::performExternalDragDropOfFiles (const StringArray& fi
auto& pool = DragAndDropHelpers::ThreadPoolHolder::getInstance()->pool;
pool.addJob (new DragAndDropHelpers::DragAndDropJob (format, medium,
canMove ? (DROPEFFECT_COPY | DROPEFFECT_MOVE) : DROPEFFECT_COPY,
callback),
std::move (callback)),
true);
return true;
@@ -345,7 +345,7 @@ bool DragAndDropContainer::performExternalDragDropOfText (const String& text, Co
pool.addJob (new DragAndDropHelpers::DragAndDropJob (format,
medium,
DROPEFFECT_COPY | DROPEFFECT_MOVE,
callback),
std::move (callback)),
true);
return true;


Loading…
Cancel
Save