[oprof-cvs] CVS: oprofile/gui oprof_start.cpp,1.81,1.82

[Philippe E. <ph...@us...>]

Update of /cvsroot/oprofile/oprofile/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv6255/gui

Modified Files:
	oprof_start.cpp 
Log Message:

bug fix: when user was specifying separate=kernel and separate=library
checkbox only separate=library was taken by opcontrol

regards,
Phil


Index: oprof_start.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- oprof_start.cpp	14 Mar 2003 13:05:28 -0000	1.81
+++ oprof_start.cpp	16 Mar 2003 13:55:46 -0000	1.82
@@ -884,11 +884,14 @@
 		args.push_back("--note-table-size=" +
 			       tostr(config.note_table_size));
 	}
-	// opcontrol allow multiple setting of --separate option
-	if (config.separate_lib_samples)
-		args.push_back("--separate=library");
-	else if (config.separate_kernel_samples)
+	// opcontrol don't allow multiple setting of --separate option
+	// separate=kernel imply separate=library whilst opcontrol script
+	// reset separate=kernel when separate=library is given so the order
+	// of setting here is meaningfull.
+	if (config.separate_kernel_samples)
 		args.push_back("--separate=kernel");
+	else if (config.separate_lib_samples)
+		args.push_back("--separate=library");
 	else
 		args.push_back("--separate=none");