From: Angus Leeming <leeming@lyx.org>
Date: Tue, 16 Sep 2003 21:46:44 +0000 (+0000)
Subject: Fix crash when cutting and pasting include insets with previewing turned on.
X-Git-Tag: 1.6.10~16068
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e2143b91e4c79f0891f48154ca1d50f780c0036f;p=features.git

Fix crash when cutting and pasting include insets with previewing turned on.


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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 32a1d5c6ac..db776541fa 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* insetinclude.C (localDispatch): ensure that params_.masterFilename_ is
+	set before trying to generate a preview, else we trigger an assert.
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* insetinclude.C (PreviewImpl::parent): return a const reference.
diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 7a4d006d23..96dc8c393c 100644
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -145,8 +145,8 @@ dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
 		InsetInclude::Params p;
 		InsetIncludeMailer::string2params(cmd.argument, p);
 		if (!p.cparams.getCmdName().empty()) {
+			p.masterFilename_ = cmd.view()->buffer()->fileName();
 			set(p);
-			params_.masterFilename_ = cmd.view()->buffer()->fileName();
 			cmd.view()->updateInset(this);
 		}
 		return DISPATCHED;
@@ -482,7 +482,9 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 	string incfile(params_.cparams.getContents());
 	string writefile;
 
-	Buffer const & b = *bufferlist.getBuffer(getMasterFilename());
+	Buffer const * buffer_ptr = bufferlist.getBuffer(getMasterFilename());
+	BOOST_ASSERT(buffer_ptr);
+	Buffer const & b = *buffer_ptr;
 
 	if (!b.temppath().empty() && !b.niceFile() && !isVerbatim()) {
 		incfile = subst(incfile, '/','@');
@@ -622,7 +624,6 @@ void InsetInclude::PreviewImpl::startMonitoring()
 
 void InsetInclude::PreviewImpl::restartLoading()
 {
-	lyxerr << "restartLoading()" << std::endl;
 	removePreview();
 	if (view())
 		view()->updateInset(&parent());