diff options
| author | Christopher Roy Bratusek <nano@jpberlin.de> | 2015-03-26 21:34:09 +0100 |
|---|---|---|
| committer | Christopher Roy Bratusek <nano@jpberlin.de> | 2015-03-26 21:34:09 +0100 |
| commit | 5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31 (patch) | |
| tree | 2ad732708e138fcce2eb67351b3e5628a51b5c9a /lumina-open/main.cpp | |
| parent | - updated debian/changelog (diff) | |
| parent | Streamline quite a bit of the background worker: (diff) | |
| download | lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.tar.gz lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.tar.bz2 lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
libLumina/LuminaOS-Debian.cpp
Diffstat (limited to 'lumina-open/main.cpp')
| -rw-r--r-- | lumina-open/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp index 657ffc07..c476cfdf 100644 --- a/lumina-open/main.cpp +++ b/lumina-open/main.cpp @@ -326,8 +326,7 @@ int main(int argc, char **argv){ int retcode = p->exitCode(); //qDebug() << "[lumina-open] Finished Cmd:" << cmd << retcode << p->exitStatus(); - //if(retcode!=0 ){ - if(p->exitStatus() == QProcess::CrashExit or retcode > 0){ + if(p->exitStatus() == QProcess::CrashExit || retcode > 0){ qDebug() << "[lumina-open] Application Error:" << retcode; QString err = QString(p->readAllStandardError()); if(err.isEmpty()){ err = QString(p->readAllStandardOutput()); } |