From 6a9d001ebfc4285fd4f1056ed61efd6d00b80f6d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Wed, 29 Apr 2009 19:22:12 +0200
Subject: [PATCH] Ignore certain "selection changed" events in the header
 editor when the whole list is updated.

This causes an old page to be shown on Windows rendering the new pages inaccessible.
Fix for bug 372.
---
 ChangeLog                       |  6 +++++
 src/mmg/header_editor_frame.cpp | 48 ++++++++++++++++++++-------------
 src/mmg/header_editor_frame.h   |  2 ++
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b1e4dac5..75d9b8725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-29  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mmg (header editor): bug fix: The header editor controls on the
+	right stopped responding after the second file had been loaded or
+	the "reload file" feature had been used. Fix for bug 372.
+
 2009-04-27  Moritz Bunkus  <moritz@bunkus.org>
 	* mmg: new feature: Added an option for clearing all inputs after
 	a successful muxing run.
diff --git a/src/mmg/header_editor_frame.cpp b/src/mmg/header_editor_frame.cpp
index b05d6b608..5f6d1b2c0 100644
--- a/src/mmg/header_editor_frame.cpp
+++ b/src/mmg/header_editor_frame.cpp
@@ -71,6 +71,7 @@ header_editor_frame_c::header_editor_frame_c(wxWindow *parent)
   , m_analyzer(NULL)
   , m_e_segment_info(NULL)
   , m_e_tracks(NULL)
+  , m_ignore_tree_selection_changes(false)
 {
   wxPanel *frame_panel = new wxPanel(this);
 
@@ -163,9 +164,13 @@ header_editor_frame_c::validate_pages() {
 
 void
 header_editor_frame_c::clear_pages() {
-  for (int i = 0; m_pages.size() > i; ++i)
-    m_pages[i]->Hide();
+  m_ignore_tree_selection_changes = true;
 
+  for (int i = 0; m_pages.size() > i; ++i)
+    if (m_pages[i]->IsShown())
+      m_pages[i]->Hide();
+
+  m_bs_page->Clear();
   m_bs_main->Hide(m_tc_tree);
 
   m_tc_tree->DeleteChildren(m_root_id);
@@ -179,6 +184,8 @@ header_editor_frame_c::clear_pages() {
 
   m_bs_main->Show(m_tc_tree);
   m_bs_main->Layout();
+
+  m_ignore_tree_selection_changes = false;
 }
 
 void
@@ -222,15 +229,19 @@ header_editor_frame_c::open_file(wxFileName file_name) {
 
   SetTitle(wxString::Format(Z("Header editor: %s"), m_file_name.GetFullName().c_str()));
 
+  m_ignore_tree_selection_changes = true;
+
   enable_menu_entries();
 
   m_bs_main->Hide(m_tc_tree);
 
   int i;
   for (i = 0; m_pages.size() > i; ++i)
-    m_pages[i]->Hide();
+    if (m_pages[i]->IsShown())
+      m_pages[i]->Hide();
 
   m_tc_tree->DeleteChildren(m_root_id);
+  m_bs_page->Clear();
   m_pages.clear();
   m_top_level_pages.clear();
 
@@ -253,7 +264,9 @@ header_editor_frame_c::open_file(wxFileName file_name) {
   m_bs_main->Show(m_tc_tree);
   m_bs_main->Layout();
 
-  last_open_dir = file_name.GetPath();
+  last_open_dir                   = file_name.GetPath();
+
+  m_ignore_tree_selection_changes = false;
 
   return true;
 }
@@ -692,25 +705,22 @@ header_editor_frame_c::find_page_for_item(wxTreeItemId id) {
 
 void
 header_editor_frame_c::on_tree_sel_changed(wxTreeEvent &evt) {
-  m_page_panel->Freeze();
-
-  if (evt.GetOldItem().IsOk()) {
-    he_page_base_c *page = find_page_for_item(evt.GetOldItem());
-    if (NULL != page)
-      page->Hide();
-  }
-
-  if (!evt.GetItem().IsOk()) {
-    m_page_panel->Thaw();
+  if (m_ignore_tree_selection_changes)
+    return;
+
+  if (!evt.GetItem().IsOk())
     return;
-  }
 
   he_page_base_c *page = find_page_for_item(evt.GetItem());
-
-  if (!page) {
-    m_page_panel->Thaw();
+  if (!page)
     return;
-  }
+
+  m_page_panel->Freeze();
+
+  int i;
+  for (i = 0; m_pages.size() > i; ++i)
+    if (m_pages[i]->IsShown())
+      m_pages[i]->Hide();
 
   page->Show();
 
diff --git a/src/mmg/header_editor_frame.h b/src/mmg/header_editor_frame.h
index d478ed31e..34deba066 100644
--- a/src/mmg/header_editor_frame.h
+++ b/src/mmg/header_editor_frame.h
@@ -73,6 +73,8 @@ public:
 
   EbmlElement *m_e_segment_info, *m_e_tracks;
 
+  bool m_ignore_tree_selection_changes;
+
 public:
   header_editor_frame_c(wxWindow *parent);
   virtual ~header_editor_frame_c();