Merge pull request LinuxCNC#3788 from snowgoer540/gregc/halscope_fix

halscope: clarify restart message, dont execute comment lines

Author: snowgoer540

src/hal/utils/scope_files.c

@@ -201,8 +201,11 @@ int read_config_file (char *filename)
 	    cp++;
 	}
 	*cp = '\0';
+    cp = cmd_buf;
+    while (isspace((unsigned char)*cp)) cp++;
+    if (*cp == '\0' || *cp == '#') continue;
 	/* parse and execute the command */
-	retval += parse_command(cmd_buf);
+	retval += parse_command(cp);
     }
     fclose(fp);
     if ( retval < 0 ) {

src/hal/utils/scope_horiz.c

@@ -690,12 +690,11 @@ static void dialog_realtime_not_linked(void)
 		GTK_DIALOG_MODAL,
 		GTK_MESSAGE_INFO,
 		GTK_BUTTONS_OK,
-		_("Sample count changed"));
+		_("Sample Count Changed - Restart Required"));
 	    gtk_message_dialog_format_secondary_text(
 		GTK_MESSAGE_DIALOG(info_dialog),
-		_("The new sample count (%d) will take effect\n"
-		"the next time halscope is started.\n\n"
-		"The setting has been saved to the configuration file."),
+		_("The new sample count (%d) has been saved to the configuration\n"
+		"file, and will take effect after restarting both LinuxCNC and Halscope.\n\n"),
 		new_samples);
 	    gtk_dialog_run(GTK_DIALOG(info_dialog));
 	    gtk_widget_destroy(info_dialog);