From 25e5dfe33024c49b5c5d6fea954f08c70ca43fb5 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Fri, 30 Oct 2009 15:33:54 +0000 Subject: [PATCH] Do not issue the warning introduced in r31809 if we are setting the parent for the first time, or we are removing the parent. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31810 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 85ec3d30af..f9c6211061 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -254,7 +254,7 @@ public: } /// void setParent(Buffer const * pb) { - if (parent_buffer != pb) + if (parent_buffer && pb && parent_buffer != pb) LYXERR0("Warning: a buffer should not have two parents!"); parent_buffer = pb; } -- 2.39.2