From 6ef8fead33beaccbfe1434a7d5a156ab1cec95c2 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Mon, 9 Apr 2012 19:02:01 +0000 Subject: [PATCH] Handle case when 'ede-launch ede-launch ...' was given. --- ede-launch/ede-launch.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ede-launch/ede-launch.cpp b/ede-launch/ede-launch.cpp index a35d41c..4a307b2 100644 --- a/ede-launch/ede-launch.cpp +++ b/ede-launch/ede-launch.cpp @@ -531,18 +531,18 @@ static const char* next_param(int curr, char **argv, int argc) { int main(int argc, char** argv) { EDE_APPLICATION("ede-launch"); - /* start dialog if we have nothing */ - if(argc <= 1) - return start_dialog(argc, argv); - int ca = 1; /* current argument index */ const char *cwd, *launch_type; cwd = launch_type = 0; /* in case if ede-launch launches itself; just skip ourself and use the rest of arguments */ - if(strstr(argv[ca], "ede-launch")) + while(argv[ca] && strstr(argv[ca], "ede-launch") != NULL) ca++; + /* start dialog if we have nothing */ + if(!argv[ca]) + return start_dialog(argc, argv); + /* parse args and stop as soon as detected first non-parameter value (not counting parameter values) */ for(; ca < argc; ca++) { if(argv[ca][0] != '-') break;