LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #251461: refuse to exit if some text frame is open

Browse source
This commit is contained in:
Werner Schweer 2017-09-14 10:30:28 +02:00
parent 2cd011639f
commit 05839cc0bb
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libmscore/layout.cpp
View file

@ -3475,8 +3475,14 @@ void Score::doLayout()
void Score::doLayoutRange(int stick, int etick)
{
if (!last()) {
qDeleteAll(_systems);
_systems.clear();
qDeleteAll(pages());
pages().clear();
return;
}
qDebug("%p %d-%d %s systems %d", this, stick, etick, isMaster() ? "Master" : "Part", int(_systems.size()));
bool layoutAll = stick <= 0 && (etick < 0 || etick >= last()->endTick());
if (stick < 0)
stick = 0;

2
mscore/shortcut.cpp
View file

@ -1886,7 +1886,7 @@ Shortcut Shortcut::_sc[] = {
},
{
MsWidget::MAIN_WINDOW,
STATE_DISABLED | STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_PLAY | STATE_FOTO,
STATE_DISABLED | STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_TEXT_EDIT | STATE_PLAY | STATE_FOTO,
"quit",
QT_TRANSLATE_NOOP("action","Quit")
},