[tracker/urho-sync] Adding kill to soft-reset



commit e43ce2eaadda7759c3e5ca7aa73c8e40543343e2
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Aug 24 15:17:37 2009 +0200

    Adding kill to soft-reset

 src/tracker-utils/tracker-processes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/tracker-utils/tracker-processes.c b/src/tracker-utils/tracker-processes.c
index d88c655..76f11ea 100644
--- a/src/tracker-utils/tracker-processes.c
+++ b/src/tracker-utils/tracker-processes.c
@@ -147,13 +147,13 @@ main (int argc, char **argv)
 		g_printerr ("%s\n",
 			    _("You can not use the --kill and --terminate arguments together"));
 		return EXIT_FAILURE;
-	} else if (hard_reset && should_terminate) {
+	} else if ((hard_reset || soft_reset) && should_terminate) {
 		g_printerr ("%s\n",
 			    _("You can not use the --terminate with --hard-reset, --kill is implied"));
 		return EXIT_FAILURE;
 	}
 
-	if (hard_reset) {
+	if (hard_reset || soft_reset) {
 		/* Imply --kill */
 		should_kill = TRUE;
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]