From 431caa02e36e77ef667187622e22fcf3e657d842 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Sat, 26 May 2007 17:38:26 +0000
Subject: [PATCH] Fix for bug 3488. Need to reconnect buffer if load of new
 buffer fails. Also added comments regarding possible fix for bug 3701.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18526 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/LyXView.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/frontends/LyXView.cpp b/src/frontends/LyXView.cpp
index 6c358ae014..b6995e0e87 100644
--- a/src/frontends/LyXView.cpp
+++ b/src/frontends/LyXView.cpp
@@ -20,6 +20,8 @@
 #include "Gui.h"
 
 #include "Buffer.h"
+//FIXME Bug 3701
+//#include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
@@ -129,7 +131,8 @@ void LyXView::setBuffer(Buffer * b)
 	if (work_area_->bufferView().buffer())
 		disconnectBuffer();
 
-	if (!b)
+	//FIXME Bug 3701
+	if (!b) // && theBufferList().empty()
 		getDialogs().hideBufferDependent();
 
 	work_area_->bufferView().setBuffer(b);
@@ -163,10 +166,12 @@ bool LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 	busy(true);
 
 	BOOST_ASSERT(work_area_);
-	if (work_area_->bufferView().buffer())
+	bool const hadBuffer = work_area_->bufferView().buffer();
+	if (hadBuffer)
 		disconnectBuffer();
 
-	bool loaded = work_area_->bufferView().loadLyXFile(filename, tolastfiles);
+	bool const loaded = 
+		work_area_->bufferView().loadLyXFile(filename, tolastfiles);
 
 	updateToc();
 	updateMenubar();
@@ -177,7 +182,9 @@ bool LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 	if (loaded) {
 		connectBuffer(*work_area_->bufferView().buffer());
 		showErrorList("Parse");
-	}
+	} else if (hadBuffer)
+		//Need to reconnect the buffer if the load failed
+		connectBuffer(*work_area_->bufferView().buffer());
 	updateStatusBar();
 	busy(false);
 	work_area_->redraw();
-- 
2.39.2