diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2013-01-20 13:31:30 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2013-01-20 13:31:30 (GMT) |
| commit | 0c3ef4a7c4b8d241186d5169eb27fc6aa6835c0b (patch) | |
| tree | 3872f0367bbee22883a702d1d2f799c9a9c2e8ac /qtools/qdir_unix.cpp | |
| parent | c236776bf1d742aa5a1b1d9087ae2e8e5f41740d (diff) | |
| download | Doxygen-0c3ef4a7c4b8d241186d5169eb27fc6aa6835c0b.zip Doxygen-0c3ef4a7c4b8d241186d5169eb27fc6aa6835c0b.tar.gz Doxygen-0c3ef4a7c4b8d241186d5169eb27fc6aa6835c0b.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; |