Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Maybe fix a string concatenation crash on startup on OS X.

This commit is contained in:
David Sansome 2012-02-21 12:10:25 +00:00
parent efd7ca3b23
commit 10af3fef37
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/macdevicelister.mm
View File

@ -232,11 +232,10 @@ CFTypeRef GetUSBRegistryEntry(io_object_t device, CFStringRef key) {
QString GetUSBRegistryEntryString(io_object_t device, CFStringRef key) { QString GetUSBRegistryEntryString(io_object_t device, CFStringRef key) {
ScopedCFTypeRef<CFStringRef> registry_string((CFStringRef)GetUSBRegistryEntry(device, key)); ScopedCFTypeRef<CFStringRef> registry_string((CFStringRef)GetUSBRegistryEntry(device, key));
if (registry_string) { if (registry_string) {
QString ret = QString::fromUtf8([(NSString*)registry_string.get() UTF8String]); return QString::fromUtf8([(NSString*)registry_string.get() UTF8String]);
return ret;
} }
return NULL; return QString();
} }
quint64 GetUSBRegistryEntryInt64(io_object_t device, CFStringRef key) { quint64 GetUSBRegistryEntryInt64(io_object_t device, CFStringRef key) {
@ -306,7 +305,7 @@ QString GetIconForDevice(io_object_t device) {
QString path = QString::fromUtf8([[bundle_url path] UTF8String]); QString path = QString::fromUtf8([[bundle_url path] UTF8String]);
path += "/Contents/Resources/"; path += "/Contents/Resources/";
path += [file UTF8String]; path += QString::fromUtf8([file UTF8String]);
return path; return path;
} }
@ -324,7 +323,7 @@ QString GetSerialForDevice(io_object_t device) {
QString GetSerialForMTPDevice(io_object_t device) { QString GetSerialForMTPDevice(io_object_t device) {
scoped_nsobject<NSString> serial((NSString*) scoped_nsobject<NSString> serial((NSString*)
GetPropertyForDevice(device, CFSTR(kUSBSerialNumberString))); GetPropertyForDevice(device, CFSTR(kUSBSerialNumberString)));
return QString(QString("MTP/") + [serial UTF8String]); return QString(QString("MTP/") + QString::fromUtf8([serial UTF8String]));
} }
QString FindDeviceProperty(const QString& bsd_name, CFStringRef property) { QString FindDeviceProperty(const QString& bsd_name, CFStringRef property) {
@ -737,7 +736,7 @@ QList<QUrl> MacDeviceLister::MakeDeviceUrls(const QString& serial) {
scoped_nsobject<NSURL> volume_path( scoped_nsobject<NSURL> volume_path(
[[properties objectForKey:(NSString*)kDADiskDescriptionVolumePathKey] copy]); [[properties objectForKey:(NSString*)kDADiskDescriptionVolumePathKey] copy]);
QString path = [[volume_path path] UTF8String]; QString path = QString::fromUtf8([[volume_path path] UTF8String]);
QUrl ret = MakeUrlFromLocalPath(path); QUrl ret = MakeUrlFromLocalPath(path);
return QList<QUrl>() << ret; return QList<QUrl>() << ret;