diff options
| author | Florian Jung <flo@windfisch.org> | 2011-09-18 15:02:03 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-09-18 15:02:03 +0000 |
| commit | 8d959d62b8013b0415afe783786f16a465b949a4 (patch) | |
| tree | 988c73c53421f92fe9d8e6652b1311c2ae4b0e92 /muse2/muse | |
| parent | ef3af1ec785c7fb89edc0347b5e75abeec0cde1d (diff) | |
fixed some invalid read bug
updated translation a bit
Diffstat (limited to 'muse2/muse')
| -rw-r--r-- | muse2/muse/functions.cpp | 6 | ||||
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp index 8e9a7cd5..b6bff169 100644 --- a/muse2/muse/functions.cpp +++ b/muse2/muse/functions.cpp @@ -879,7 +879,8 @@ unsigned get_groupedevents_len(const QString& pt) { unsigned maxlen=0; - Xml xml(pt.toLatin1().constData()); + QByteArray pt_= pt.toLatin1(); + Xml xml(pt_.constData()); for (;;) { Xml::Token token = xml.parse(); @@ -1062,7 +1063,8 @@ void paste_at(const QString& pt, int pos, int max_distance, bool always_new_part map<Part*, unsigned> expand_map; map<Part*, set<Part*> > new_part_map; - Xml xml(pt.toLatin1().constData()); + QByteArray pt_= pt.toLatin1(); + Xml xml(pt_.constData()); for (;;) { Xml::Token token = xml.parse(); diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 9637334e..265c7ec3 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -2017,7 +2017,7 @@ list<note_len_t> parse_note_len(int len_ticks, int begin_tick, vector<int>& foo, int len_now=0; int last_number=foo[pos]; - do {pos++;len_done++;len_now++;} while (! ((foo[pos]<=last_number) || (len_done==len) || (pos==foo.size())) ); + do {pos++;len_done++;len_now++;} while (! ((pos==foo.size()) || (foo[pos]<=last_number) || (len_done==len)) ); len_now=len_now*TICKS_PER_WHOLE/64; @@ -4583,10 +4583,8 @@ void ScoreCanvas::add_new_parts(const std::map< Part*, std::set<Part*> >& param) * changing "share" status, the changed state isn't stored * ? pasting in editors sometimes fails oO? ( ERROR: reading eventlist * from clipboard failed. ignoring this one... ) [ not reproducible ] - * o cakewalk-mode is ignored when saving config * * CURRENT TODO - * o drum editor has "clef column" * ! o fix sigedit boxes (see also "important todo") * o ticks-to-quarter spinboxes * o newly created windows have to be focussed! |