From c2b84695788367350bce7221685c11bc24363f1e Mon Sep 17 00:00:00 2001 From: John Levon Date: Fri, 31 May 2002 01:14:53 +0000 Subject: [PATCH] fix bug 416 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4308 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/lyxvc.C | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 91eb9b4d1f..16e6fa9cea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-05-31 John Levon + + * lyxvc.C: fix bug 416 (make sure buffer is saved before + attempt to register it with a VCS) + 2002-05-30 Jean-Marc Lasgouttes * lyx_main.C (init): honor variables LYX_DIR_13x and diff --git a/src/lyxvc.C b/src/lyxvc.C index 4ac6398c5f..a181ec96b4 100644 --- a/src/lyxvc.C +++ b/src/lyxvc.C @@ -75,6 +75,16 @@ void LyXVC::buffer(Buffer * buf) void LyXVC::registrer() { + string const filename = owner_->fileName(); + + // there must be a file to save + if (!IsFileReadable(filename)) { + Alert::alert(_("File not saved"), + _("You must save the file"), + _("before it can be registered.")); + return; + } + // it is very likely here that the vcs is not created yet... if (!vcs) { string const cvs_entries = "CVS/Entries"; @@ -82,16 +92,16 @@ void LyXVC::registrer() if (IsFileReadable(cvs_entries)) { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with CVS" << endl; - vcs = new CVS(cvs_entries, owner_->fileName()); + vcs = new CVS(cvs_entries, filename); } else { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with RCS" << endl; - vcs = new RCS(owner_->fileName()); + vcs = new RCS(filename); } vcs->owner(owner_); @@ -100,7 +110,7 @@ void LyXVC::registrer() // If the document is changed, we might want to save it if (!vcs->owner()->isLyxClean() && Alert::askQuestion(_("Changes in document:"), - MakeDisplayPath(vcs->owner()->fileName(), 50), + MakeDisplayPath(filename, 50), _("Save document and proceed?"))) { vcs->owner()->getUser()->owner() ->getLyXFunc()->dispatch(LFUN_MENUWRITE); -- 2.39.5