From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 14 May 2012 11:08:30 +0000 (+0200)
Subject: Fix bug #7982: LyX does not work if working directory a hard disk drive like D:\
X-Git-Tag: 2.1.0beta1~1870
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=93ebb7a863377f6dbcaf724972b747b5c3f20c24;p=features.git

Fix bug #7982: LyX does not work if working directory a hard disk drive like D:\

In this case, the working dir has already a slash at the end.
Appending another one would result in a path ending with a double slash,
which has a special meaning when used in TEXINPUTS (all subdirs would
be recursively scanned). So, avoid doing that.
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1dc5d592e5..ad119bdbf1 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2713,7 +2713,11 @@ string Buffer::absFileName() const
 
 string Buffer::filePath() const
 {
-	return d->filename.onlyPath().absFileName() + "/";
+	int last = d->filename.onlyPath().absFileName().length() - 1;
+
+	return d->filename.onlyPath().absFileName()[last] == '/'
+		? d->filename.onlyPath().absFileName()
+		: d->filename.onlyPath().absFileName() + "/";
 }