Fixed crashes reloading songs having open editors. Previous memleak fixes

 revealed some problems. Installed bool TopWin::deleting(). It is set true when 
 closeEvent() is called in any self-deleting TopWins. Used it to make all such 
 TopWins and their corresponding child canvasses ignore songChanged signals.

2 files changed, 6 insertions, 2 deletions

diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index eadfa68c..e4837bf9 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -183,7 +183,8 @@ static QString midiMetaComment(const MusECore::Event& ev)
 
 void ListEdit::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -193,6 +194,9 @@ void ListEdit::closeEvent(QCloseEvent* e)
 
 void ListEdit::songChanged(int type)
       {
+      if(_isDeleting)  // Ignore while while deleting to prevent crash.
+        return;
+        
       if (type == 0)
             return;
       if (type & (SC_PART_REMOVED | SC_PART_MODIFIED
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 7548fc86..1c0c1bd9 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -86,7 +86,7 @@ class ListEdit : public MidiEditor {
       void songChanged(int);
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       ListEdit(MusECore::PartList*);