From 05839cc0bb2fe2ba2a8f82ed897bb846ecbefe0d Mon Sep 17 00:00:00 2001
From: Werner Schweer <ws@wschweer.de>
Date: Thu, 14 Sep 2017 10:30:28 +0200
Subject: [PATCH] fix #251461: refuse to exit if some text frame is open

---
 libmscore/layout.cpp | 8 +++++++-
 mscore/shortcut.cpp  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
index 3fee4902d024..155c03a005e3 100644
--- a/libmscore/layout.cpp
+++ b/libmscore/layout.cpp
@@ -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;
diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
index c2fdb18d4a17..3708ddd14b10 100644
--- a/mscore/shortcut.cpp
+++ b/mscore/shortcut.cpp
@@ -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")
          },