Skip to content

Commit

Permalink
Ignore existing files when performing Linux specific backup/restore
Browse files Browse the repository at this point in the history
Previously would cause an error.
  • Loading branch information
oblivioncth committed Jul 7, 2024
1 parent cce4764 commit 167196a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/src/kernel/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ CoreError Core::enqueueStartupTasks(const QString& serverOverride)
{
// Copy backup prefix
QDir winePrefixBak(mFlashpointInstall->dir().absolutePath() + u"/FPSoftware/.winebak"_s);
if(Qx::copyDirectory(winePrefixBak, winePrefix, true, false).isFailure())
if(Qx::copyDirectory(winePrefixBak, winePrefix, true, Qx::ReplaceMode::Skip).isFailure())
qWarning("Failed to restore WINE prefix backup");

// Setup WINE registry modification
Expand Down Expand Up @@ -762,7 +762,7 @@ void Core::enqueueShutdownTasks()
wineSaveBackup->setDescription(u"Backup Flash WINE saves"_s);
wineSaveBackup->setAction([saveSrc, saveDest]{
saveDest.mkpath(u"."_s);
return Qx::copyDirectory(saveSrc, saveDest, true, false);
return Qx::copyDirectory(saveSrc, saveDest, true, Qx::ReplaceMode::Skip);
});

mTaskQueue.push(wineSaveBackup);
Expand Down

0 comments on commit 167196a

Please sign in to comment.