Some cleanup and a fix for a potential crash while investigating #7572.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38858 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 39a87c517a9a4dd331c5fbffd5af8e97c0df9c02..3ddc0efd427ef05040d2c600ebb2e3f9233298bb 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2188,8 +2188,8 @@ int BufferView::scrollUp(int offset)
 
 void BufferView::setCursorFromRow(int row)
 {
-       int tmpid = -1;
-       int tmppos = -1;
+       int tmpid;
+       int tmppos;
 
        buffer_.texrow().getIdFromRow(row, tmpid, tmppos);
 

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 97d320491782d6fdb83136fee0b3ed11bf80e1b7..701abf11567fb60c955831dc91b9c44df43309ff 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2930,6 +2930,13 @@ bool GuiView::goToFileRow(string const & argument)
                        return false;
                }
        }
+       if (!buf) {
+               message(bformat(
+                       _("No buffer for file `%1$s'."),
+                       makeDisplayPath(file_name))
+               );
+               return false;
+       }
        setBuffer(buf);
        documentBufferView()->setCursorFromRow(row);
        return true;