Skip to content

Commit

Permalink
Merge pull request #5392 from leoetlino/disable-menu-items-again
Browse files Browse the repository at this point in the history
WX: Don't create data dir if it is missing
  • Loading branch information
JosJuice committed May 7, 2017
2 parents eff8c1e + 57f8520 commit 59dab8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Source/Core/DolphinWX/GameListCtrl.cpp
Expand Up @@ -1015,7 +1015,10 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
// an inconsistent state; the emulated software can do *anything* to its data directory,
// and we definitely do not want the user to touch anything in there if it's running.
for (auto* menu_item : {open_save_folder_item, export_save_item})
menu_item->Enable(!Core::IsRunning() || !SConfig::GetInstance().bWii);
{
menu_item->Enable((!Core::IsRunning() || !SConfig::GetInstance().bWii) &&
File::IsDirectory(selected_iso->GetWiiFSPath()));
}
}
popupMenu.Append(IDM_OPEN_CONTAINING_FOLDER, _("Open &containing folder"));

Expand Down
3 changes: 0 additions & 3 deletions Source/Core/DolphinWX/ISOFile.cpp
Expand Up @@ -366,9 +366,6 @@ const std::string GameListItem::GetWiiFSPath() const

const std::string path = Common::GetTitleDataPath(m_title_id, Common::FROM_CONFIGURED_ROOT);

if (!File::Exists(path))
File::CreateFullPath(path);

if (path[0] == '.')
return WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR));

Expand Down

0 comments on commit 59dab8b

Please sign in to comment.