Am 18.01.2008 um 07:46 schrieb [EMAIL PROTECTED]:
Author: bpeng Date: Fri Jan 18 07:46:06 2008 New Revision: 22619 URL: http://www.lyx.org/trac/changeset/22619 Log: Embedding: fix enable() logic Modified: lyx-devel/trunk/src/EmbeddedFiles.cpp Modified: lyx-devel/trunk/src/EmbeddedFiles.cpp URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/EmbeddedFiles.cpp?rev=22619 = = = = = = = = ====================================================================== --- lyx-devel/trunk/src/EmbeddedFiles.cpp (original) +++ lyx-devel/trunk/src/EmbeddedFiles.cpp Fri Jan 18 07:46:06 2008 @@ -112,9 +112,6 @@ void EmbeddedFile::enable(bool flag, Buffer const * buf) { - if (enabled() == flag) - return; - if (flag) { temp_path_ = buf->temppath(); if (!suffixIs(temp_path_, '/')) @@ -123,7 +120,8 @@ if (inzip_name_ != calcInzipName(buf->filePath())) syncInzipFile(buf->filePath()); updateFromExternalFile(); - } + } else + extract();
Now I get an unfulfilled assert because extract() is called, but the file is not in embedded mode:
#5 0x00013550 in boost::assertion_failed (expr=0x54e108 "enabled()", function=0x54e344 "bool lyx::EmbeddedFile::extract() const", file=0x54e088 "/Users/sts/Quellen/mac/lyx-scope-dynmacro/src/ EmbeddedFiles.cpp", line=134) at /Users/sts/Quellen/mac/lyx-scope- dynmacro/src/boost.cpp:47 #6 0x000aa731 in lyx::EmbeddedFile::extract (this=0x19b64e60) at / Users/sts/Quellen/mac/lyx-scope-dynmacro/src/EmbeddedFiles.cpp:134 #7 0x000abf9d in lyx::EmbeddedFile::enable (this=0x19b64e60, flag=false, buf=0x19b0ca00) at /Users/sts/Quellen/mac/lyx-scope- dynmacro/src/EmbeddedFiles.cpp:126 #8 0x00295e12 in lyx::InsetGraphics::read (this=0x19b64e50, [EMAIL PROTECTED], [EMAIL PROTECTED]) at /Users/sts/Quellen/mac/lyx-scope- dynmacro/src/insets/InsetGraphics.cpp:282 #9 0x000b85fa in lyx::readInset ([EMAIL PROTECTED], [EMAIL PROTECTED]) at /Users/sts/Quellen/mac/lyx-scope-dynmacro/src/factory.cpp:537
... when loading a file. Stefan
