Skip to content

Commit

Permalink
fix #275834: crash when add slur to score
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmcclinch committed Sep 3, 2018
1 parent 65d49b9 commit 76c6353
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions mscore/scoreaccessibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ ScoreAccessibility* ScoreAccessibility::inst = 0;
ScoreAccessibility::ScoreAccessibility(QMainWindow* mainWindow) : QObject(mainWindow)
{
this->mainWindow = mainWindow;
statusBarLabel = 0;
statusBarLabel = new QLabel(mainWindow->statusBar());
mainWindow->statusBar()->addWidget(statusBarLabel);
}

void ScoreAccessibility::createInstance(QMainWindow* mainWindow)
Expand All @@ -102,18 +103,13 @@ ScoreAccessibility::~ScoreAccessibility()

void ScoreAccessibility::clearAccessibilityInfo()
{
if(statusBarLabel != 0) {
mainWindow->statusBar()->removeWidget(statusBarLabel);
delete statusBarLabel;
statusBarLabel = 0;
static_cast<MuseScore*>(mainWindow)->currentScoreView()->score()->setAccessibleInfo(tr("No selection"));
}
statusBarLabel->setText("");
static_cast<MuseScore*>(mainWindow)->currentScoreView()->score()->setAccessibleInfo(tr("No selection"));
}

void ScoreAccessibility::currentInfoChanged()
{
clearAccessibilityInfo();
statusBarLabel = new QLabel(mainWindow->statusBar());
ScoreView* scoreView = static_cast<MuseScore*>(mainWindow)->currentScoreView();
Score* score = scoreView->score();
if (score->selection().isSingle()) {
Expand Down Expand Up @@ -184,7 +180,6 @@ void ScoreAccessibility::currentInfoChanged()
statusBarLabel->setText(tr("List Selection"));
score->setAccessibleInfo(tr("List Selection"));
}
mainWindow->statusBar()->addWidget(statusBarLabel);
}

ScoreAccessibility* ScoreAccessibility::instance()
Expand Down

0 comments on commit 76c6353

Please sign in to comment.