diff options
| author | 2020-07-12 12:28:18 -0400 | |
|---|---|---|
| committer | 2020-07-15 13:27:04 -0400 | |
| commit | 1bbc61f5f1f65478727fbe6351240331d77f104d (patch) | |
| tree | f1e637dcf1983ae17188e220d730756bc914b606 | |
| parent | Remove global system instance and address feedback (diff) | |
| download | yuzu-1bbc61f5f1f65478727fbe6351240331d77f104d.tar.gz yuzu-1bbc61f5f1f65478727fbe6351240331d77f104d.tar.xz yuzu-1bbc61f5f1f65478727fbe6351240331d77f104d.zip | |
Use proper install result when overwriting files
| -rw-r--r-- | src/core/file_sys/registered_cache.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 0f4d52d35..92417ef70 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp | |||
| @@ -643,7 +643,7 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex | |||
| 643 | 643 | ||
| 644 | Refresh(); | 644 | Refresh(); |
| 645 | if (result) { | 645 | if (result) { |
| 646 | return InstallResult::ErrorAlreadyExists; | 646 | return InstallResult::OverwriteExisting; |
| 647 | } | 647 | } |
| 648 | return InstallResult::Success; | 648 | return InstallResult::Success; |
| 649 | } | 649 | } |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 432379705..d51cb2bcb 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1755,7 +1755,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) { | |||
| 1755 | *nsp, true, qt_raw_copy); | 1755 | *nsp, true, qt_raw_copy); |
| 1756 | if (res == FileSys::InstallResult::Success) { | 1756 | if (res == FileSys::InstallResult::Success) { |
| 1757 | return InstallResult::Success; | 1757 | return InstallResult::Success; |
| 1758 | } else if (res == FileSys::InstallResult::ErrorAlreadyExists) { | 1758 | } else if (res == FileSys::InstallResult::OverwriteExisting) { |
| 1759 | return InstallResult::Overwrite; | 1759 | return InstallResult::Overwrite; |
| 1760 | } else { | 1760 | } else { |
| 1761 | return InstallResult::Failure; | 1761 | return InstallResult::Failure; |
| @@ -1842,7 +1842,7 @@ InstallResult GMainWindow::InstallNCA(const QString& filename) { | |||
| 1842 | 1842 | ||
| 1843 | if (res == FileSys::InstallResult::Success) { | 1843 | if (res == FileSys::InstallResult::Success) { |
| 1844 | return InstallResult::Success; | 1844 | return InstallResult::Success; |
| 1845 | } else if (res == FileSys::InstallResult::ErrorAlreadyExists) { | 1845 | } else if (res == FileSys::InstallResult::OverwriteExisting) { |
| 1846 | return InstallResult::Overwrite; | 1846 | return InstallResult::Overwrite; |
| 1847 | } else { | 1847 | } else { |
| 1848 | return InstallResult::Failure; | 1848 | return InstallResult::Failure; |