r40027 - lyx-devel/trunk/src/frontends/qt4

[vfr]

Author: vfr
Date: Thu Oct 27 11:31:17 2011
New Revision: 40027
URL: http://www.lyx.org/trac/changeset/40027

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

Modified:
   lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Thu Oct 27 
11:05:55 2011        (r40026)
+++ lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Thu Oct 27 
11:31:17 2011        (r40027)
@@ -305,6 +305,11 @@
                                guiApp->currentView()->setBusy(true);
                        }
                        buf = theBufferList().getBuffer(fname);
+                       if (!buf) {
+                               view_.setBusy(false);
+                               return false;
+                       }
+
                        lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                                  buf->absFileName()));
                        bv = view_.documentBufferView();
@@ -327,7 +332,9 @@
 
                // No match found in current buffer (however old selection 
might have been replaced)
                // select next buffer in scope, if any
-               bool prompt = nextPrevBuffer(buf, opt);
+               bool const prompt = nextPrevBuffer(buf, opt);
+               if (!buf)
+                       break;
                if (prompt) {
                        if (wrap_answer != -1)
                                break;