summaryrefslogtreecommitdiff
path: root/muse2/muse/synth.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/synth.cpp
parent716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/synth.cpp')
-rw-r--r--muse2/muse/synth.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index cf065bbb..332ff90f 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -143,7 +143,7 @@ static Synth* findSynth(const QString& sclass, const QString& label, Synth::Type
i != MusEGlobal::synthis.end(); ++i)
{
if( ((*i)->baseName() == sclass) &&
- (label.isEmpty() || ((*i)->name() == label)) &&
+ (label.isEmpty() || ((*i)->name() == label)) &&
(type == Synth::SYNTH_TYPE_END || type == (*i)->synthType()) )
return *i;
}
@@ -165,7 +165,6 @@ static SynthI* createSynthInstance(const QString& sclass, const QString& label,
QString n;
n.setNum(s->instances());
QString instance_name = s->name() + "-" + n;
-
if (si->initInstance(s, instance_name)) {
delete si;
return 0;