anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #6950: Wake up from waiting state after encountering a file parsing error.

Browse Source 
see r35714.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36866 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-12-13 14:44:19 +00:00
parent 4e68265745
commit 0f99c43425
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/GuiView.cpp
View File

@ -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."));

3
status.16x
View File

@ -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