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

branch: Fix a crash in adv F&R when a manual could not be loaded

Browse Source 
see r40027.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40039 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-10-27 13:58:53 +00:00
parent 11e727b977
commit 3c8f3c934d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/qt4/FindAndReplace.cpp
View File

@ -305,6 +305,11 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
guiApp->currentView()->setBusy(true); guiApp->currentView()->setBusy(true);
} }
buf = theBufferList().getBuffer(fname); buf = theBufferList().getBuffer(fname);
if (!buf) {
view_.setBusy(false);
return false;
}
lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
buf->absFileName())); buf->absFileName()));
bv = view_.documentBufferView(); bv = view_.documentBufferView();
@ -327,7 +332,9 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
// No match found in current buffer (however old selection might have been replaced) // No match found in current buffer (however old selection might have been replaced)
// select next buffer in scope, if any // select next buffer in scope, if any
bool prompt = nextPrevBuffer(buf, opt); bool const prompt = nextPrevBuffer(buf, opt);
if (!buf)
break;
if (prompt) { if (prompt) {
if (wrap_answer != -1) if (wrap_answer != -1)
break; break;

3
status.20x
View File

@ -212,6 +212,9 @@ What's new
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE
- Fix a crash when searching in all manuals, but the manuals could
not be loaded.
* BUILD/INSTALLATION * BUILD/INSTALLATION