From c8bffb01531addda9f345c30d614500650ca82a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 14 May 2017 00:15:12 +0200 Subject: Reuse the IOS code for WAD installation * Less code and logic duplication. * Fixes a bug with the data dir not being created, steps being done in the wrong order. --- Source/Core/DolphinWX/FrameTools.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index f8f99cdd81..1098852605 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -83,6 +83,8 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" +#include "UICommon/WiiUtils.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" @@ -1209,11 +1211,8 @@ void CFrame::OnInstallWAD(wxCommandEvent& event) wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME | wxPD_SMOOTH); - u64 titleID = DiscIO::CNANDContentManager::Access().Install_WiiWAD(fileName); - if (titleID == TITLEID_SYSMENU) - { + if (WiiUtils::InstallWAD(fileName)) UpdateLoadWiiMenuItem(); - } } void CFrame::OnUninstallWAD(wxCommandEvent&) -- cgit v1.2.3