[gnumeric] nlsolve: avoid critical about unknown idle source.



commit 56ca01b89db9ee560e6cb38234b5876c3a62be6a
Author: Morten Welinder <terra gnome org>
Date:   Thu Jun 5 20:44:36 2014 -0400

    nlsolve: avoid critical about unknown idle source.

 NEWS                          |    1 +
 plugins/nlsolve/ChangeLog     |    5 +++++
 plugins/nlsolve/gnm-nlsolve.c |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 06e6af3..ac122cf 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Morten:
        * Fix crashes on exit.  [#730857]  [#730884]
        * Handle value formats for xlsx export.  [#724517]
        * Improve xlsx import/export of rich text.  [#726189]
+       * Fix solver critical.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.16
diff --git a/plugins/nlsolve/ChangeLog b/plugins/nlsolve/ChangeLog
index 0854171..c28b2bd 100644
--- a/plugins/nlsolve/ChangeLog
+++ b/plugins/nlsolve/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05  Morten Welinder  <terra gnome org>
+
+       * gnm-nlsolve.c (gnm_nlsolve_idle): if we're cancelling the
+       callback, clear the tag.
+
 2014-05-23  Morten Welinder <terra gnome org>
 
        * Release 1.12.16
diff --git a/plugins/nlsolve/gnm-nlsolve.c b/plugins/nlsolve/gnm-nlsolve.c
index b43402b..25aec11 100644
--- a/plugins/nlsolve/gnm-nlsolve.c
+++ b/plugins/nlsolve/gnm-nlsolve.c
@@ -706,6 +706,9 @@ gnm_nlsolve_idle (gpointer data)
                rosenbrock_shutdown (nl);
        }
 
+       if (!call_again)
+               nl->idle_tag = 0;
+
        return call_again;
 }
 


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