Merge pull request #5663 from leoetlino/import-fix

IOS/ES: Fix import sanity check
dolphin-emu · Jun 24, 2017 · 1bd1775 · 1bd1775
2 parents d715e74 + a3fdda1
commit 1bd1775
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Source/Core/Core/IOS/ES/TitleManagement.cpp b/Source/Core/Core/IOS/ES/TitleManagement.cpp
@@ -365,8 +365,10 @@ ReturnCode ES::ImportTitleDone(Context& context)
         if (content.IsShared())
           return shared_content_map.GetFilenameFromSHA1(content.sha1).has_value();
 
-        return File::Exists(Common::GetTitleContentPath(title_id, Common::FROM_SESSION_ROOT) +
-                            StringFromFormat("%08x.app", content.id));
+        // Note: the import hasn't been finalised yet, so the whole title directory
+        // is still in /import, not /title.
+        return File::Exists(Common::GetImportTitlePath(title_id, Common::FROM_SESSION_ROOT) +
+                            StringFromFormat("/content/%08x.app", content.id));
       });
   if (!has_all_required_contents)
     return ES_EINVAL;