summaryrefslogtreecommitdiff
path: root/muse2/muse/liste/editevent.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
committerFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
commitd2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch)
tree387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/liste/editevent.cpp
parent716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/liste/editevent.cpp')
-rw-r--r--muse2/muse/liste/editevent.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 6781c365..a60ea229 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -379,7 +379,7 @@ void EditMetaDialog::toggled(bool flag)
QString dst;
if (flag) { // convert to hex
- dst = string2hex((unsigned char*)src, strlen(src));
+ dst = string2hex((unsigned char*)src, ba.length());
}
else { // convert to string
int len;
@@ -422,7 +422,7 @@ void EditMetaDialog::accept()
const char* src = ba.constData();
if (!hexButton->isChecked()) {
meta = (unsigned char*)strdup(src);
- len = strlen(src);
+ len = ba.length();
QDialog::accept();
return;
}
@@ -638,6 +638,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const MusECore::Event& event,
continue;
}
MusECore::MidiController* c = port->midiController(num);
+ {
isList i = sList.begin();
for (; i != sList.end(); ++i) {
if (*i == c->name())
@@ -645,6 +646,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const MusECore::Event& event,
}
if (i == sList.end())
sList.push_back(c->name());
+ }
}
MusECore::MidiController* mc = port->midiController(num);
int idx = 0;