From b7fe90aa364c98eb2d5260dce0078f7ad034f0a3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 17 Jul 2011 08:08:51 +0000 Subject: The mountpoint is stored with normalized separators. Make sure to convert it on reading to avoid not finding it even if stored with native separators in the configuration. Fix a warning on Windows. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30145 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/utils.cpp | 2 +- rbutil/rbutilqt/configure.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index 1962df2a16..d52eba4250 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp @@ -116,7 +116,7 @@ QString Utils::filesystemName(QString path) #if defined(Q_OS_WIN32) wchar_t volname[MAX_PATH+1]; bool res = GetVolumeInformationW((LPTSTR)path.utf16(), volname, MAX_PATH+1, - NULL, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, 0); if(res) { name = QString::fromWCharArray(volname); } diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 4ce2acb5e6..7dfd325255 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -278,7 +278,7 @@ void Config::setUserSettings() // devices tab refreshMountpoint(); - mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); + mountpoint = QDir::toNativeSeparators(RbSettings::value(RbSettings::Mountpoint).toString()); setMountpoint(mountpoint); // cache tab @@ -426,7 +426,7 @@ void Config::updateTtsState(int index) ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/dialog-error.png"))); ui.testTTS->setEnabled(false); } - + delete tts; /* Config objects are never deleted (in fact, they are leaked..), so we can't rely on QObject, since that would delete the TTSBase instance on application exit*/ } -- cgit v1.2.3