mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 01:22:33 +00:00
branch: Fix bug #6356: Reloading image does not work for compiling.
- Add a FileName::refresh function and replace one call to lastModified which was just meant to refresh the file info. - Refresh the file info, otherwise InsetGraphics::latex might still think that the file does not exist. see r32354 and r32355. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@32415 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0bcffd888d
commit
c736659a90
@ -349,8 +349,7 @@ static string const findTargetFormat(string const & from)
|
|||||||
bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
|
bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
|
||||||
{
|
{
|
||||||
// First, check that the file exists!
|
// First, check that the file exists!
|
||||||
// force a refresh.
|
filename_.refresh();
|
||||||
filename_.lastModified();
|
|
||||||
if (!filename_.isReadableFile()) {
|
if (!filename_.isReadableFile()) {
|
||||||
if (status_ != ErrorNoFile) {
|
if (status_ != ErrorNoFile) {
|
||||||
status_ = ErrorNoFile;
|
status_ = ErrorNoFile;
|
||||||
|
@ -223,6 +223,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case LFUN_GRAPHICS_RELOAD:
|
case LFUN_GRAPHICS_RELOAD:
|
||||||
|
params_.filename.refresh();
|
||||||
graphic_->reload();
|
graphic_->reload();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -474,6 +474,12 @@ FileName FileName::tempPath()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void FileName::refresh() const
|
||||||
|
{
|
||||||
|
d->refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
time_t FileName::lastModified() const
|
time_t FileName::lastModified() const
|
||||||
{
|
{
|
||||||
// QFileInfo caches information about the file. So, in case this file has
|
// QFileInfo caches information about the file. So, in case this file has
|
||||||
|
@ -78,6 +78,8 @@ public:
|
|||||||
|
|
||||||
/// returns true if the file exists
|
/// returns true if the file exists
|
||||||
bool exists() const;
|
bool exists() const;
|
||||||
|
/// refreshes the file info
|
||||||
|
void refresh() const;
|
||||||
/// \return true if this object points to a symbolic link.
|
/// \return true if this object points to a symbolic link.
|
||||||
bool isSymLink() const;
|
bool isSymLink() const;
|
||||||
/// \return true if the file is empty.
|
/// \return true if the file is empty.
|
||||||
|
Loading…
Reference in New Issue
Block a user