aboutsummaryrefslogtreecommitdiff
path: root/lumina-open
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-04-20 13:20:52 -0400
committerKen Moore <ken@pcbsd.org>2015-04-20 13:20:52 -0400
commit3195432db816416fab7a895dcd442e898290c0dc (patch)
tree5c44a19c626b29a44de9ef2e027689fc39be705f /lumina-open
parentUpdate th elibLumina.pro: (diff)
downloadlumina-3195432db816416fab7a895dcd442e898290c0dc.tar.gz
lumina-3195432db816416fab7a895dcd442e898290c0dc.tar.bz2
lumina-3195432db816416fab7a895dcd442e898290c0dc.zip
Add a special flag to prevent the lumina-open crash handler from starting up during the session cleanup procedures.
Diffstat (limited to 'lumina-open')
-rw-r--r--lumina-open/main.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp
index de7d137b..d0d2ced1 100644
--- a/lumina-open/main.cpp
+++ b/lumina-open/main.cpp
@@ -325,19 +325,19 @@ int main(int argc, char **argv){
}
retcode = p->exitCode();
//qDebug() << "[lumina-open] Finished Cmd:" << cmd << retcode << p->exitStatus();
-
+ if( QFile::exists("/tmp/.luminastopping") ){ watch = false; } //closing down session - ignore "crashes" (app could have been killed during cleanup)
if( (p->exitStatus() == QProcess::CrashExit || retcode > 0) && watch){
qDebug() << "[lumina-open] Application Error:" << retcode;
QString err = QString(p->readAllStandardError());
if(err.isEmpty()){ err = QString(p->readAllStandardOutput()); }
- //Setup the application
- QApplication App(argc, argv);
- LuminaThemeEngine theme(&App);
- LUtils::LoadTranslation(&App,"lumina-open");
- QMessageBox dlg(QMessageBox::Critical, QObject::tr("Application Error"), QObject::tr("The following application experienced an error and needed to close:")+"\n\n"+cmd );
- if(!err.isEmpty()){ dlg.setDetailedText(err); }
- dlg.exec();
- }
+ //Setup the application
+ QApplication App(argc, argv);
+ LuminaThemeEngine theme(&App);
+ LUtils::LoadTranslation(&App,"lumina-open");
+ QMessageBox dlg(QMessageBox::Critical, QObject::tr("Application Error"), QObject::tr("The following application experienced an error and needed to close:")+"\n\n"+cmd );
+ if(!err.isEmpty()){ dlg.setDetailedText(err); }
+ dlg.exec();
+ }
}
return retcode;
}
bgstack15