Changeset 5013955


Ignore:
Timestamp:
01/27/14 12:37:53 (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.0
Children:
2c85ef2
Parents:
00bfd65
Message:

Backport:

https://github.com/pcbsd/pcbsd/commit/35b47b710ae25a90a3964df63ef2d839ba99e3b4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    ra453e65 r5013955  
    143143  if(QFile::exists(xhome+"/.xprofile")){ 
    144144    qDebug() << "Run user ~/.xprofile"; 
    145     this->start("sh "+xhome+"/.xprofile");//Cannot start in parallel if it sets env variables 
    146     if(!this->waitForFinished(30000) ){ 
    147       //If it still has not finished this after 30 seconds, kill it 
    148       this->terminate(); 
    149     } 
     145    cmd.prepend(". "+xhome+"/.xprofile; "); 
     146    //Make sure it has executable permissions 
     147    QFile::setPermissions(xhome+"/.xprofile", QFile::permissions(xhome+"/.xprofile") | QFile::ExeOwner); 
    150148  } 
    151149  connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
Note: See TracChangeset for help on using the changeset viewer.