summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-04-05 18:59:54 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-04-05 18:59:54 +0000
commit00a3e13b1fb1bdcd9dd1c56ccefcbe0c9b1e13dc (patch)
tree90834f109f57143c9586abb58d3118821634efc7
parenta5d749c15d2f34a78ce55c751d98dcfc39ab8099 (diff)
downloadrockbox-00a3e13b1fb1bdcd9dd1c56ccefcbe0c9b1e13dc.tar.gz
rockbox-00a3e13b1fb1bdcd9dd1c56ccefcbe0c9b1e13dc.zip
fix a stupid bug which made mountpoint detection based on folders non-functional on Ipod and Gigabeat.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16978 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/autodetection.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp
index 34a0db4df3..7c194c8bbf 100644
--- a/rbutil/rbutilqt/autodetection.cpp
+++ b/rbutil/rbutilqt/autodetection.cpp
@@ -127,8 +127,9 @@ bool Autodetection::detect()
127 } 127 }
128 } 128 }
129 // detection based on player specific folders 129 // detection based on player specific folders
130 QStringList rootfolders = root.entryList(QDir::Dirs | QDir::NoDotAndDotDot); 130 QStringList rootfolders = root.entryList(QDir::Dirs
131 if(rootfolders.contains("GBSYSTEM"), Qt::CaseInsensitive) 131 | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
132 if(rootfolders.contains("GBSYSTEM", Qt::CaseInsensitive))
132 { 133 {
133 // GBSYSTEM folder -> Gigabeat 134 // GBSYSTEM folder -> Gigabeat
134 m_device = "gigabeatf"; 135 m_device = "gigabeatf";
@@ -137,7 +138,7 @@ bool Autodetection::detect()
137 } 138 }
138#if defined(Q_OS_WIN32) 139#if defined(Q_OS_WIN32)
139 // on windows, try to detect the drive letter of an Ipod 140 // on windows, try to detect the drive letter of an Ipod
140 if(rootfolders.contains("iPod_Control"), Qt::CaseInsensitive) 141 if(rootfolders.contains("iPod_Control", Qt::CaseInsensitive))
141 { 142 {
142 // iPod_Control folder -> Ipod found 143 // iPod_Control folder -> Ipod found
143 // detecting of the Ipod type is done below using ipodpatcher 144 // detecting of the Ipod type is done below using ipodpatcher