┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorFrank Reininghaus <[email protected]>2012-12-07 22:31:24 +0100
committerFrank Reininghaus <[email protected]>2012-12-07 22:31:24 +0100
commitb2a580c2b9b85a5a5b91e2eb3f218cea3b7b98c3 (patch)
tree322ef1d66572d86ce2dcbcab859535d64cd3fec4 /src/main.cpp
parent46f2c2ef3c90ccb5741455d488cec578ff981ddf (diff)
parente97c050157890dd1adf14d98bbed4aa86af98354 (diff)
Merge remote-tracking branch 'origin/KDE/4.9'
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2a6538e35..e46c53a91 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,11 +82,13 @@ KDE_EXPORT int kdemain(int argc, char **argv)
options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
KCmdLineArgs::addCmdLineOptions(options);
- DolphinApplication app;
- if (app.isSessionRestored()) {
- app.restoreSession();
+ {
+ DolphinApplication app;
+ if (app.isSessionRestored()) {
+ app.restoreSession();
+ }
+ app.exec(); // krazy:exclude=crashy
}
- app.exec(); // krazy:exclude=crashy
return 0;
}