mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-08 03:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4828 from martincapello/fix-dropping-unsupported-files

Browse Source
This commit is contained in:
David Capello 2024-12-11 15:20:44 -03:00 committed by GitHub
commit 0d2f5a1a9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/cmd/drop_on_timeline.cpp
View File

@ -111,11 +111,18 @@ bool DropOnTimeline::getNextDocFromPaths(Doc** srcDoc)
std::unique_ptr<FileOp> fop( std::unique_ptr<FileOp> fop(
FileOp::createLoadDocumentOperation(context, m_paths.front(), flags)); FileOp::createLoadDocumentOperation(context, m_paths.front(), flags));
// Remove the path that is currently being processed
m_paths.erase(m_paths.begin());
// Do nothing (the user cancelled or something like that) // Do nothing (the user cancelled or something like that)
if (!fop) if (!fop)
return false; return false;
if (fop->hasError()) {
console.printf(fop->error().c_str());
return true;
}
base::paths fopFilenames; base::paths fopFilenames;
fop->getFilenameList(fopFilenames); fop->getFilenameList(fopFilenames);
// Remove paths that will be loaded by the current file operation. // Remove paths that will be loaded by the current file operation.
@ -125,11 +132,6 @@ bool DropOnTimeline::getNextDocFromPaths(Doc** srcDoc)
m_paths.erase(it); m_paths.erase(it);
} }
if (fop->hasError()) {
console.printf(fop->error().c_str());
return true;
}
OpenFileJob task(fop.get(), true); OpenFileJob task(fop.get(), true);
task.showProgressWindow(); task.showProgressWindow();