From ea8adc3de71a4bd38f7f4cf1eab9a83fa7269f2d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 5 Feb 2020 14:04:52 +0100 Subject: [PATCH] [calamares] Simplify return from main --- src/calamares/main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index caf1f6cfd..2a49b4806 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -116,11 +116,10 @@ main( int argc, char* argv[] ) handle_args( a ); KDSingleApplicationGuard guard( KDSingleApplicationGuard::AutoKillOtherInstances ); - int returnCode = 0; if ( guard.isPrimaryInstance() ) { a.init(); - returnCode = a.exec(); + return a.exec(); } else { @@ -135,7 +134,6 @@ main( int argc, char* argv[] ) { qDebug() << " " << i.isValid() << i.pid() << i.arguments(); } + return 69; // EX_UNAVAILABLE on FreeBSD } - - return returnCode; }