diff options
| author | Al <gabriel.cortesi@outlook.com> | 2019-06-01 09:54:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 09:54:09 +0200 |
| commit | f00314442b9c3c28e846c64da3c3f776e50656de (patch) | |
| tree | 371f52175eaa83db0b3b354b95d382bd7080ca38 /src/organizercore.cpp | |
| parent | 41f8da011d1df7a368e3fb73f972cee1f4efd0c0 (diff) | |
| parent | d2eb890f2b9df13c402db6adeaafa7e3f4a7d736 (diff) | |
Merge pull request #740 from isanae/new-conflict-list
New conflict list, new "go to" conflict menu item
Diffstat (limited to 'src/organizercore.cpp')
| -rw-r--r-- | src/organizercore.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 3ad4e586..892162f6 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1321,6 +1321,8 @@ bool OrganizerCore::executeFileVirtualized( bool OrganizerCore::previewFileWithAlternatives( QWidget* parent, QString fileName, int selectedOrigin) { + fileName = QDir::fromNativeSeparators(fileName); + // what we have is an absolute path to the file in its actual location (for the primary origin) // what we want is the path relative to the virtual data directory |