diff options
| author | Tim E. Real <termtech@rogers.com> | 2011-04-28 06:14:25 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2011-04-28 06:14:25 +0000 |
| commit | dcef2c49e36e86036a4caa08a6bcc0580cc53da7 (patch) | |
| tree | 3c8832519a9e41c5c14f8e740a49294ed0251e7c /muse2/muse/midiedit | |
| parent | e2cec3f03fdee64da1c5080498476c1cdd43bbdb (diff) | |
Small scoreedit and dssi controls out fix. More separation of Alsa/Jack midi processing -
as a possible fix for crash report by Geoff B. Please see ChangeLog
Diffstat (limited to 'muse2/muse/midiedit')
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index cbe9c20a..71439600 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -367,7 +367,7 @@ bool ScoreEdit::set_name(QString newname, bool emit_signal, bool emergency_name) { if (emergency_name) { - while (set_name(create_random_string(), emit_signal, false) == false); + while (set_name(create_random_string(), emit_signal, false) == false) ; return true; } else @@ -773,7 +773,8 @@ QString IntToQStr(int i) void color_image(QImage& img, const QColor& color) { uchar* ptr=img.bits(); - int bytes=img.byteCount(); + //int bytes=img.byteCount(); + int bytes=img.bytesPerLine() * img.height(); // By Tim. For older Qt versions. Tested OK on Qt4.5. int r,g,b; color.getRgb(&r,&g,&b); |