diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
| commit | dcd4714c4413348d02eb7224dafee5d06be43dfb (patch) | |
| tree | 3872f0367bbee22883a702d1d2f799c9a9c2e8ac /qtools/qdir_unix.cpp | |
| parent | 775ab3be95c02dd805aadc73ffbe3c18877c12a4 (diff) | |
| download | Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.zip Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.gz Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.bz2 | |
Release-1.8.3.1
Diffstat (limited to 'qtools/qdir_unix.cpp')
| -rw-r--r-- | qtools/qdir_unix.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/qtools/qdir_unix.cpp b/qtools/qdir_unix.cpp index e845043..2257265 100644 --- a/qtools/qdir_unix.cpp +++ b/qtools/qdir_unix.cpp @@ -82,12 +82,14 @@ QString QDir::canonicalPath() const char cur[PATH_MAX]; char tmp[PATH_MAX]; - (void)GETCWD( cur, PATH_MAX ); - if ( CHDIR(QFile::encodeName(dPath)) >= 0 ) { - (void)GETCWD( tmp, PATH_MAX ); - r = QFile::decodeName(tmp); + if (GETCWD( cur, PATH_MAX )) { + if ( CHDIR(QFile::encodeName(dPath)) >= 0 ) { + if (GETCWD( tmp, PATH_MAX )) { + r = QFile::decodeName(tmp); + } + (void)CHDIR( cur ); + } } - (void)CHDIR( cur ); slashify( r ); return r; |