Changeset dc77b5c


Ignore:
Timestamp:
07/18/13 08:52:13 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
f967699
Parents:
985aa83 (diff), 454bd81 (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 branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    r1aa6ed7 r1b398c1  
    205205      if(cDownload==pbiID[i]){ sDownload=TRUE; PMAN->stopProcess(ProcessManager::DOWNLOAD); } 
    206206      if(cUpdate==pbiID[i]){ sUpdate=TRUE; PMAN->stopProcess(ProcessManager::UPDATE); } 
    207       if(cRemove==pbiID[i]){ sRemove=TRUE; PMAN->stopProcess(ProcessManager::REMOVE); } 
    208       if(cInstall==pbiID[i]){ sInstall=TRUE; }// PMAN->stopProcess(ProcessManager::INSTALL); } 
     207      if(cRemove==pbiID[i]){ sRemove=TRUE; } 
     208      if(cInstall==pbiID[i]){ sInstall=TRUE; } 
    209209      //Ignore OTHER process - those commands are pretty much instant 
    210210    } 
Note: See TracChangeset for help on using the changeset viewer.