Two more GUI inconsistencies

- Respect use_of_ff='min' for models loaded from project files
- Disable configure button after loading a project

2 files changed, 10 insertions, 1 deletions

diff --git a/NEWS.md b/NEWS.md
index bad01bd..7ee36ab 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,13 @@
 # NEWS for package 'gmkin'
 
+## gmkin 0.6-5 (2015-12-11)
+
+### Bug fixes
+
+- When configuring a fit using a model with use_of_ff = 'max', this was ignored when the model was loaded from a project file
+
+- The configure button was not disabled when switching a project (which clears model and dataset selections)
+
 ## gmkin 0.6-4 (2015-12-09)
 
 - Various small corrections of unexpected or incorrect GUI behaviour. See git commit logs for details.
diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R
index ef60139..8e8e445 100644
--- a/inst/GUI/gmkin.R
+++ b/inst/GUI/gmkin.R
@@ -194,6 +194,7 @@ p.switcher <- function(h, ...) {
     svalue(center) <- 1

     svalue(c.ds) <- empty_conf_labels[1]

     svalue(c.m) <- empty_conf_labels[2]

+    f.conf$call_Ext("disable")

     update_p_editor(p.cur)

     update_ds.df()

     update_m.df()

@@ -351,7 +352,7 @@ update_plot_obssel <- function() {
 configure_fit_handler <- function(h, ...) { # Configure fit button {{{3

   if (length(intersect(names(m.cur$spec), ds.cur$observed)) > 0) {

     if (is.null(m.cur$cf) && Sys.which("gcc") != "") {

-      mtmp <- mkinmod(speclist = m.cur$spec)

+      mtmp <- mkinmod(speclist = m.cur$spec, use_of_ff = m.cur$use_of_ff)

       mtmp$name <- m.cur$name

       m.cur <<- mtmp

     }