summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/liste/listedit.cpp2
-rw-r--r--muse2/muse/marker/markerview.cpp2
-rw-r--r--muse2/muse/master/lmaster.cpp2
-rw-r--r--muse2/muse/master/masteredit.cpp2
-rw-r--r--muse2/muse/midiedit/drumedit.cpp2
-rw-r--r--muse2/muse/midiedit/pianoroll.cpp2
-rw-r--r--muse2/muse/waveedit/waveedit.cpp2
8 files changed, 8 insertions, 7 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 32e0be1f..fa86c053 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,6 +1,7 @@
21.10.2010 Toolbar1 usage of Q3ListBox changed to QTableWidget. (p4.0.3 Tim)
More Toolbar1 fixes. (p4.0.4 Tim)
Fixed widgets/tools.cpp EditToolBar::EditToolBar connect Q3Action. (p4.0.5 Tim)
+ Crashes: Removed all "undoRedo->removeFrom..." from destructors (~pianoroll() ~drumedit() etc.) (p4.0.6 Tim)
20.10.2010
* Fixed: cmake should work now. (T356)
- Changed the QT4_WRAP_UI3 macro to generate <filename>.h instead of ui_<filename>.h
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 4cdb7892..31573571 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -543,7 +543,7 @@ ListEdit::ListEdit(PartList* pl)
ListEdit::~ListEdit()
{
- undoRedo->removeFrom(listTools);
+ // undoRedo->removeFrom(listTools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index 39885ec7..ce08d786 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -268,7 +268,7 @@ MarkerView::~MarkerView()
// p3.3.47
//printf("MarkerView::~MarkerView() before undoRedo->removeFrom(tools)\n");
- undoRedo->removeFrom(tools);
+ // undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 0638049e..42486a8b 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -144,7 +144,7 @@ LMaster::LMaster()
LMaster::~LMaster()
{
- undoRedo->removeFrom(tools);
+ //undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index ef8abde8..53189573 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -234,7 +234,7 @@ MasterEdit::MasterEdit()
MasterEdit::~MasterEdit()
{
- undoRedo->removeFrom(tools);
+ //undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index ebe89ac6..82d0186d 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -475,7 +475,7 @@ void DrumEdit::setTime(unsigned tick)
DrumEdit::~DrumEdit()
{
- undoRedo->removeFrom(tools);
+ //undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 93bf615c..4d2540d7 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -417,7 +417,7 @@ void PianoRoll::setTime(unsigned tick)
PianoRoll::~PianoRoll()
{
- undoRedo->removeFrom(tools);
+ // undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index b342c14d..cb9d9a17 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -246,7 +246,7 @@ void WaveEdit::setTime(unsigned samplepos)
WaveEdit::~WaveEdit()
{
- undoRedo->removeFrom(tools);
+ // undoRedo->removeFrom(tools); // p4.0.6 Removed
}
//---------------------------------------------------------