summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@digia.com>2013-03-07 09:30:18 +0100
committerRainer Keller <rainer.keller@digia.com>2013-03-07 09:30:18 +0100
commitd20abe70f0abf02091d6c18c7e5ed45101da6ea2 (patch)
tree06dc73fff12311c4f1c2c96a58b87ba16775aeac /main.cpp
parenta7f07ef9854b3501e7147e695fe0a7aa88140c1d (diff)
Remove some qFatal
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/main.cpp b/main.cpp
index 695fe7d..49fb17e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -47,8 +47,10 @@ static pid_t lastPID()
bool ok;
pid_t pid = f.readAll().toUInt(&ok);
f.close();
- if (!ok)
- qFatal("Invalid last PID.");
+ if (!ok) {
+ qDebug("Invalid last PID.");
+ return 0;
+ }
return pid;
}
@@ -86,25 +88,31 @@ int main(int argc, char **argv)
QStringList args = app.arguments();
args.removeFirst();
- if (args.size() == 0)
- qFatal("No arguments given.");
+ if (args.size() == 0) {
+ qDebug("No arguments given.");
+ return 1;
+ }
while (!args.isEmpty()) {
if (args[0] == "--start") {
if (args.size() < 2) {
- qFatal("--start requires and argument");
+ qDebug("--start requires and argument");
+ return 1;
}
binary = args[1];
args.removeFirst();
- if (binary.isEmpty())
- qFatal("App path is empty");
+ if (binary.isEmpty()) {
+ qDebug("App path is empty");
+ return 1;
+ }
stop();
loadDefaults(defaultArgs);
} else if (args[0] == "--stop") {
stop();
return 0;
} else {
- qFatal("unknown argument: %s", args.first().toLocal8Bit().constData());
+ qDebug() << "unknown argument:" << args.first();
+ return 1;
}
args.removeFirst();
}