Changeset b34565c


Ignore:
Timestamp:
12/27/13 12:26:56 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
c71c90f
Parents:
534c70e
Message:

Make sure we always perform the check for "child" devices in the mounttray. This should prevent issues with duplicate devices because they do not list the "partition"s in the file -s output.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/devCheck.cpp

    rc930de6 rb34565c  
    4040QStringList DevCheck::devChildren(QString node){ 
    4141  devDir.cd(DEVICEDIR); 
    42   QStringList subdevs; 
    43   //if(node.isEmpty()){ 
    44     subdevs = devDir.entryList(devFilter, QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    45   //}else{ 
    46     //subdevs = devDir.entryList(QStringList(node+"*"), QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    47   //} 
     42  QStringList subdevs = devDir.entryList(devFilter, QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    4843  //Clean up the list of children 
    4944  for(int i=0; i<subdevs.length(); i++){ 
     
    5348    } 
    5449  } 
    55   qDebug() << "[DEBUG] " <<node << "Device Children:" << subdevs; 
     50  //qDebug() << "[DEBUG] " <<node << "Device Children:" << subdevs; 
    5651  return subdevs; 
    5752} 
     
    127122  if( !isCD ){ 
    128123    QStringList tmp = output.split(","); 
    129     if( !tmp.filter("partition ").isEmpty() ){ 
     124    //if( !tmp.filter("partition ").isEmpty() ){ 
    130125      //Check for actual sub-devices (*s[#][a/b/c/....]) 
    131126      if( devChildren(node).length() > 0 ){ hasPartitions = TRUE; } 
    132     } 
     127    //} 
    133128    if( !tmp.filter("last mounted on /").isEmpty() && (detType == "SATA")){ 
    134129      isMounted = TRUE; 
Note: See TracChangeset for help on using the changeset viewer.