summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-04-25 19:53:23 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-04-25 19:53:23 +0000
commit5974951aeaf0a86b83175e018d5bf35e509f5181 (patch)
tree3e05209740103d566700c3f866e630290c440462 /muse2
parentefac864c25429cdb853fba82484606f94fb6d4ec (diff)
crashfix loading new song
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog3
-rw-r--r--muse2/muse/app.cpp2
-rw-r--r--muse2/muse/song.cpp1
3 files changed, 5 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index a3e4706c..204225e2 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,6 @@
+25.04.2011:
+ - added a songChanged at the end of clear when loading a new song, intended effect was to
+ clear GUI before loading new song to fix some nasty crashes, seems to work (rj)
24.04.2011:
- Improved master list editor editing of keys, dropdown should not 'stay behind' anymore (rj)
21.04.2011:
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 8143bb0c..98bc0d85 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -4849,7 +4849,7 @@ again:
}
}
microSleep(100000);
- song->clear(false, clear_all);
+ song->clear(true, clear_all);
microSleep(100000);
return false;
}
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index ad6de83d..cf040348 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -2161,6 +2161,7 @@ void Song::clear(bool signal, bool /*clear_all*/)
if (signal) {
emit loopChanged(false);
recordChanged(false);
+ emit songChanged(-1);
}
}