fix crash with layout-paste

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8252c420be99d4a1204ee97f036a62d239befddd..b152a761e48a4c47270374cd252c8fdf3f3126b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * text2.C (pasteEnvironmentType): avoid crash if layout-copy has
+       not been invoked
+
 2002-12-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * lyxfunc.C (getStatus): query lyx_gui::getStatus() to catter for

diff --git a/src/text2.C b/src/text2.C
index bc1f0d6af5b524e5a6443f9afafbdbbbaaabd012..00b4dbbc4b4a78d0db7d85fbb725b2fd31531226 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1423,7 +1423,9 @@ void LyXText::copyEnvironmentType()
 
 void LyXText::pasteEnvironmentType(BufferView * bview)
 {
-       setLayout(bview, copylayouttype);
+       // do nothing if there has been no previous copyEnvironmentType()
+       if (!copylayouttype.empty())
+               setLayout(bview, copylayouttype);
 }