commit 2f5396c871d51aa9e9b579c17dd9469fc313a732
Author: Tommaso Cucinotta <[email protected]>
Date: Wed Oct 19 11:18:10 2016 +0200
Tolerate formats that are not supported by lyx2lyx.
---
src/Buffer.cpp | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 58de3b5..3d0f780 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1179,14 +1179,22 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
if (file_format != LYX_FORMAT) {
FileName tmpFile;
ReadStatus ret_clf = convertLyXFormat(fn, tmpFile, file_format);
- if (ret_clf != ReadSuccess)
- return ret_clf;
- ret_clf = readFile(tmpFile);
if (ret_clf == ReadSuccess) {
- d->file_format = file_format;
- d->need_format_backup = true;
+ ret_clf = readFile(tmpFile);
+ if (ret_clf == ReadSuccess) {
+ d->file_format = file_format;
+ d->need_format_backup = true;
+ return ret_clf;
+ }
+ }
+ if (ret_clf != ReadSuccess) {
+ int const ret = Alert::prompt(_("Document format
failure"),
+ _("Fileformat unrecognized by lyx2lyx. Trying
to load anyway, "
+ "but some contents might be lost and LyX
might crash!\n"
+ "Would you like to proceed ?"), 0, 1,
_("&No"), _("&Yes"));
+ if (ret == 0)
+ return ret_clf;
}
- return ret_clf;
}
// FIXME: InsetInfo needs to know whether the file is under VCS
