Changeset 93148b2


Ignore:
Timestamp:
05/20/14 10:50:11 (3 months ago)
Author:
Claudio L <claudio@…>
Parents:
b45365b (diff), 7129f10 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge 7129f10ae143396f30a33174135c0da06e51ab71 into b45365b58395480a7c01d7d54b77522f1a78230c

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.