summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/drumedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/midiedit/drumedit.cpp')
-rw-r--r--muse2/muse/midiedit/drumedit.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 563f7eda..ae13734a 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -447,18 +447,17 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
canvas->setPos(0, cpos.tick(), true);
canvas->selectAtTick(cpos.tick());
//canvas->selectFirst();
-
- if(canvas->track())
- toolbar->setSolo(canvas->track()->solo());
- unsigned pos;
+ unsigned pos=0;
if(initPos >= MAXINT)
pos = song->cpos();
- else
- pos = initPos;
if(pos > MAXINT)
pos = MAXINT;
- hscroll->setOffset((int)pos);
+ if (pos)
+ hscroll->setOffset((int)pos);
+
+ if(canvas->track())
+ toolbar->setSolo(canvas->track()->solo());
QSettings settings("MusE", "MusE-qt");
//restoreGeometry(settings.value("Drumedit/geometry").toByteArray());
@@ -1103,6 +1102,7 @@ void DrumEdit::keyPressEvent(QKeyEvent* event)
zoomlvl++;
int newmag = ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
+
hscroll->setMag(newmag);
//printf("mag = %d zoomlvl = %d newmag = %d\n", mag, zoomlvl, newmag);
return;