From 0f99c43425a473bf555e0b6dd3968ff5c3d34f67 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 13 Dec 2010 14:44:19 +0000
Subject: [PATCH] branch: Fix bug #6950: Wake up from waiting state after
 encountering a file parsing error.

see r35714.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36866 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiView.cpp | 8 +++++++-
 status.16x                    | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index d1d1cd7b42..7d845cb8b3 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1391,7 +1391,13 @@ Buffer * GuiView::loadDocument(FileName const & filename, bool tolastfiles)
 {
 	setBusy(true);
 
-	Buffer * newBuffer = checkAndLoadLyXFile(filename);
+	Buffer * newBuffer = 0;
+	try {
+		newBuffer = checkAndLoadLyXFile(filename);
+	} catch (ExceptionMessage const & e) {
+		setBusy(false);
+		throw(e);
+	}
 
 	if (!newBuffer) {
 		message(_("Document not loaded."));
diff --git a/status.16x b/status.16x
index db819525aa..2b23d8fd0d 100644
--- a/status.16x
+++ b/status.16x
@@ -123,6 +123,9 @@ What's new
 
 - Recognize the program listings' parameter 'breakatwhitespace' (bug 7077).
 
+- Wake up from waiting state after encountering a file parsing error
+  (bug 6950).
+
 
 * DOCUMENTATION AND LOCALIZATION