Skip to content

Commit 497843d

Browse files
Merge pull request #18445 from RomanPudashkin/crash_when_open_score_fix
crash_when_open_score_fix
2 parents 9818d94 + 9b26987 commit 497843d

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/engraving/rw/read400/readcontext.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,15 @@ void ReadContext::clearOrphanedConnectors()
517517
std::set<LinkedObjects*> deletedLinks;
518518

519519
auto deleteConnectors = [&deletedLinks](std::shared_ptr<ConnectorInfoReader> c) {
520-
EngravingItem* conn = c->releaseConnector();
520+
EngravingItem* conn = c ? c->releaseConnector() : nullptr;
521+
if (!conn) {
522+
return;
523+
}
521524

522525
LinkedObjects* links = conn->links();
523526
bool linksWillBeDeleted = links && links->size() == 1;
524527

525-
if (conn && !conn->isTuplet()) { // tuplets are added to score even when not finished
528+
if (!conn->isTuplet()) { // tuplets are added to score even when not finished
526529
if (linksWillBeDeleted) {
527530
deletedLinks.insert(links);
528531
}

src/engraving/rw/read410/readcontext.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,15 @@ void ReadContext::clearOrphanedConnectors()
517517
std::set<LinkedObjects*> deletedLinks;
518518

519519
auto deleteConnectors = [&deletedLinks](std::shared_ptr<ConnectorInfoReader> c) {
520-
EngravingItem* conn = c->releaseConnector();
520+
EngravingItem* conn = c ? c->releaseConnector() : nullptr;
521+
if (!conn) {
522+
return;
523+
}
521524

522525
LinkedObjects* links = conn->links();
523526
bool linksWillBeDeleted = links && links->size() == 1;
524527

525-
if (conn && !conn->isTuplet()) { // tuplets are added to score even when not finished
528+
if (!conn->isTuplet()) { // tuplets are added to score even when not finished
526529
if (linksWillBeDeleted) {
527530
deletedLinks.insert(links);
528531
}

0 commit comments

Comments
 (0)