|
Lines 314-320
bool SMTPFileSystem::parseOptions(int ar
Link Here
|
| 314 |
|
314 |
|
| 315 |
--m_options.m_device_no; |
315 |
--m_options.m_device_no; |
| 316 |
|
316 |
|
| 317 |
#ifdef HAVE_LIBUSB1 |
317 |
#if 0 //def HAVE_LIBUSB1 |
| 318 |
// device file and -- device are mutually exclusive, fail if both set |
318 |
// device file and -- device are mutually exclusive, fail if both set |
| 319 |
if (m_options.m_device_no && m_options.m_device_file) { |
319 |
if (m_options.m_device_no && m_options.m_device_file) { |
| 320 |
m_options.m_good = false; |
320 |
m_options.m_good = false; |
|
Lines 383-393
bool SMTPFileSystem::exec()
Link Here
|
| 383 |
} |
383 |
} |
| 384 |
|
384 |
|
| 385 |
#ifdef HAVE_LIBUSB1 |
385 |
#ifdef HAVE_LIBUSB1 |
| 386 |
if (m_options.m_device_file) { |
386 |
// Try to use device file first, ignore otherwise |
| 387 |
// Try to use device file first, if provided |
387 |
if (!m_options.m_device_file || |
| 388 |
if (!m_device.connect(m_options.m_device_file)) |
388 |
!m_device.connect(m_options.m_device_file)) |
| 389 |
return false; |
|
|
| 390 |
} else |
| 391 |
#endif // HAVE_LIBUSB1 |
389 |
#endif // HAVE_LIBUSB1 |
| 392 |
{ |
390 |
{ |
| 393 |
// Connect to MTP device by order number, if no device file supplied |
391 |
// Connect to MTP device by order number, if no device file supplied |