From 6017a6fae62090b58e466984d570263bb07114d1 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 30 Oct 2010 19:46:05 +0000 Subject: STR 2348: fixed possibly wrong relative path git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7778 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + src/filename_absolute.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index a055d5cc9..8db8f842d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ CHANGES IN FLTK 1.3.0 + - Fixed wrong relative path (STR #2384) - Fixed static allocation in Fl_Tabs (STR #2370) - Fixed Fl_Widget::measure_label() to const (STR #2406) - Added step by step README's for MSWindows, OS X, and four diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx index 08da91ce5..123dc36a3 100644 --- a/src/filename_absolute.cxx +++ b/src/filename_absolute.cxx @@ -210,6 +210,7 @@ fl_filename_relative(char *to, // O - Relative filename if (isdirsep(*slash)) slash ++; // do the same for the current dir + if (isdirsep(*newslash)) newslash --; if (*newslash != '\0') while (!isdirsep(*newslash) && newslash > cwd) newslash --; -- cgit v1.2.3