[gnumeric] Cell Comments: fix critical.

[Morten Welinder <mortenw src gnome org>]

commit 7826287c3b3253a0fe52c1caa5ca55baf27e17af
Author: Morten Welinder <terra gnome org>
Date:   Mon Mar 8 11:26:19 2010 -0500

    Cell Comments: fix critical.

 ChangeLog               |    4 ++++
 NEWS                    |    1 +
 src/sheet-control-gui.c |    3 ++-
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0b25ed7..52fc580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-08  Morten Welinder  <terra gnome org>
+
+	* src/sheet-control-gui.c (scg_comment_select): Fix critical.
+
 2010-03-06  Jean Brefort  <jean brefort normalesup org>
 
 	* src/item-cursor.c (item_cursor_draw): fix cursor appearance when the
diff --git a/NEWS b/NEWS
index 3d69dff..ac17d7d 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Morten:
 	* Fix GLPK solver issue.  [#611407]
 	* Fix ssindex crash.  [#611842]
 	* Fix ODF export of intersection.  [#611824]
+	* Fix cell comment critical.
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.0
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 1df1ff6..ac74280 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -2625,11 +2625,12 @@ void
 scg_comment_select (SheetControlGUI *scg, GnmComment *cc)
 {
 	g_return_if_fail (IS_SHEET_CONTROL_GUI (scg));
-	g_return_if_fail (scg->comment.timer == -1);
 
 	if (scg->comment.selected != NULL)
 		scg_comment_unselect (scg, scg->comment.selected);
 
+	g_return_if_fail (scg->comment.timer == -1);
+
 	scg->comment.selected = cc;
 	scg->comment.timer = g_timeout_add (1000,
 		(GSourceFunc)cb_cell_comment_timer, scg);