Changeset 7129f10


Ignore:
Timestamp:
May 20, 2014 5:54:49 AM (7 weeks ago)
Author:
claudiobsd <claudio@…>
Branches:
master, releng/10.0.2
Children:
eaea8ff, 93148b2
Parents:
b45365b
Message:

Fixed the following bugs: Crash when clicking on white area on disks tab. "Rename pool" menu option out of place.
Changed behavior: Rename pool does not automount when re-importing the pool.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-zmanager/zmanagerwindow.cpp

    r28bf313 r7129f10  
    15521552        /*  QString menutext        ,   int triggermask, triggerflags    ,  action_func slot */ 
    15531553        { QString(tr("Create new pool"))    ,     ~ITEM_ISPOOL, ITEM_NONE         ,  SLOT(zpoolCreate(bool)) }, 
    1554         { QString(tr("Rename pool"))    ,     ~ITEM_ISPOOL, ITEM_NONE         ,  SLOT(zpoolRename(bool)) }, 
     1554        { QString(tr("Rename pool"))    ,     ITEM_TYPE|ITEM_ISEXPORTED|ITEM_ISDESTROYED, ITEM_ISPOOL         ,  SLOT(zpoolRename(bool)) }, 
    15551555        { QString(tr("Destroy pool"))       ,    ITEM_TYPE|ITEM_ISEXPORTED|ITEM_ISDESTROYED, ITEM_ISPOOL         ,  SLOT(zpoolDestroy(bool)) }, 
    15561556        { QString(tr("Add devices..."))       ,    ITEM_TYPE|ITEM_ISEXPORTED|ITEM_ISDESTROYED, ITEM_ISPOOL         ,  SLOT(zpoolAdd(bool)) }, 
     
    16291629    QTreeWidgetItem *item=ui->deviceList->itemAt(p); 
    16301630 
    1631     vdev_t *dev=getDiskbyName(item->text(0).split(" ",QString::SkipEmptyParts).at(0)); 
     1631    vdev_t *dev=(item)? getDiskbyName(item->text(0).split(" ",QString::SkipEmptyParts).at(0)):NULL; 
    16321632 
    16331633    if(dev==NULL) return; 
     
    25272527    } 
    25282528 
    2529  
    25302529    DialogName dlg; 
    25312530 
     
    25622561 
    25632562    if(!processzpoolErrors(a)) { 
    2564         cmdline="zpool import "+id+" \""+dlg.getName()+"\""; 
     2563        cmdline="zpool import -N "+id+" \""+dlg.getName()+"\""; 
    25652564 
    25662565//        qDebug() << cmdline; 
Note: See TracChangeset for help on using the changeset viewer.