From 9aeb95bc0aeb013e5c27ac24bd6958b2c42c25ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Sun, 15 Apr 2018 14:51:37 +0200
Subject: [PATCH 1/2] WX: Only call IsTitleInstalled when core is stopped

---
 Source/Core/DolphinWX/GameListCtrl.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index c0f7303e90..30c973eb42 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -897,10 +897,12 @@ void GameListCtrl::OnRightClick(wxMouseEvent& event)
         auto* const uninstall_wad_item =
             popupMenu.Append(IDM_LIST_UNINSTALL_WAD, _("Uninstall from the NAND"));
         // These should not be allowed while emulation is running for safety reasons.
-        for (auto* menu_item : {install_wad_item, uninstall_wad_item})
-          menu_item->Enable(!Core::IsRunning() || !SConfig::GetInstance().bWii);
-
-        if (!WiiUtils::IsTitleInstalled(selected_iso->GetTitleID()))
+        const bool can_enable = !Core::IsRunning() || !SConfig::GetInstance().bWii;
+        install_wad_item->Enable(can_enable);
+        // IsTitleInstalled should also only be called when nothing is using the NAND.
+        if (can_enable)
+          uninstall_wad_item->Enable(WiiUtils::IsTitleInstalled(selected_iso->GetTitleID()));
+        else
           uninstall_wad_item->Enable(false);
       }
 

From 72a6674b73524da2809928ec6afa46cedb1b1c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Sun, 15 Apr 2018 14:56:08 +0200
Subject: [PATCH 2/2] WiiUtils: Migrate to new filesystem interface

A followup for the migration work started in 8317a66e
---
 Source/Core/Core/WiiUtils.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp
index 931c400d4b..fdf58ccfe8 100644
--- a/Source/Core/Core/WiiUtils.cpp
+++ b/Source/Core/Core/WiiUtils.cpp
@@ -34,6 +34,7 @@
 #include "Core/IOS/Device.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/ES/Formats.h"
+#include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/IOS.h"
 #include "Core/SysConf.h"
 #include "DiscIO/DiscExtractor.h"
@@ -168,18 +169,17 @@ bool UninstallTitle(u64 title_id)
 
 bool IsTitleInstalled(u64 title_id)
 {
-  const std::string content_dir =
-      Common::GetTitleContentPath(title_id, Common::FromWhichRoot::FROM_CONFIGURED_ROOT);
+  IOS::HLE::Kernel ios;
+  const auto entries = ios.GetFS()->ReadDirectory(0, 0, Common::GetTitleContentPath(title_id));
 
-  if (!File::IsDirectory(content_dir))
+  if (!entries)
     return false;
 
   // Since this isn't IOS and we only need a simple way to figure out if a title is installed,
   // we make the (reasonable) assumption that having more than just the TMD in the content
   // directory means that the title is installed.
-  const auto entries = File::ScanDirectoryTree(content_dir, false);
-  return std::any_of(entries.children.begin(), entries.children.end(),
-                     [](const auto& file) { return file.virtualName != "title.tmd"; });
+  return std::any_of(entries->begin(), entries->end(),
+                     [](const std::string& file) { return file != "title.tmd"; });
 }
 
 // Common functionality for system updaters.