Merge pull request #5534 from JosJuice/dont-bind-no-filesystem

DolphinWX: Don't bind context menu when GC filesystem is invalid
dolphin-emu · Jun 4, 2017 · 4e584ec · 4e584ec
2 parents 145483d + d664c45
commit 4e584ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Source/Core/DolphinWX/ISOProperties/FilesystemPanel.cpp b/Source/Core/DolphinWX/ISOProperties/FilesystemPanel.cpp
@@ -159,10 +159,11 @@ FilesystemPanel::FilesystemPanel(wxWindow* parent, wxWindowID id,
     : wxPanel{parent, id}, m_opened_iso{opened_iso}
 {
   CreateGUI();
-  BindEvents();
-  PopulateFileSystemTree();
-
-  m_tree_ctrl->Expand(m_tree_ctrl->GetRootItem());
+  if (PopulateFileSystemTree())
+  {
+    BindEvents();
+    m_tree_ctrl->Expand(m_tree_ctrl->GetRootItem());
+  }
 }
 
 FilesystemPanel::~FilesystemPanel() = default;
@@ -194,7 +195,7 @@ void FilesystemPanel::CreateGUI()
   SetSizer(main_sizer);
 }
 
-void FilesystemPanel::PopulateFileSystemTree()
+bool FilesystemPanel::PopulateFileSystemTree()
 {
   const std::vector<DiscIO::Partition> partitions = m_opened_iso->GetPartitions();
   m_has_partitions = !partitions.empty();
@@ -224,10 +225,12 @@ void FilesystemPanel::PopulateFileSystemTree()
   {
     m_filesystem = DiscIO::CreateFileSystem(m_opened_iso.get(), DiscIO::PARTITION_NONE);
     if (!m_filesystem)
-      return;
+      return false;
 
     CreateDirectoryTree(m_tree_ctrl, m_tree_ctrl->GetRootItem(), m_filesystem->GetFileList());
   }
+
+  return true;
 }
 
 void FilesystemPanel::OnRightClickTree(wxTreeEvent& event)

diff --git a/Source/Core/DolphinWX/ISOProperties/FilesystemPanel.h b/Source/Core/DolphinWX/ISOProperties/FilesystemPanel.h
@@ -39,7 +39,7 @@ class FilesystemPanel final : public wxPanel
   void CreateGUI();
   void BindEvents();
 
-  void PopulateFileSystemTree();
+  bool PopulateFileSystemTree();
 
   void OnRightClickTree(wxTreeEvent&);
   void OnExtractFile(wxCommandEvent&);