From 1ba359fd30b539b2106fd395178c33cb5097b466 Mon Sep 17 00:00:00 2001
From: mh17 <mh17>
Date: Tue, 26 Jan 2010 13:44:38 +0000
Subject: [PATCH] fix to RC feautre menu show DNA crash RT123891
---
src/zmapServer/pipe/pipeServer.c | 6 +++---
src/zmapWindow/zmapWindowMenus.c | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/zmapServer/pipe/pipeServer.c b/src/zmapServer/pipe/pipeServer.c
index 99821b563..25194fb97 100755
--- a/src/zmapServer/pipe/pipeServer.c
+++ b/src/zmapServer/pipe/pipeServer.c
@@ -34,7 +34,7 @@
* HISTORY:
* Last edited: Jan 14 10:10 2010 (edgrif)
* Created: 2009-11-26 12:02:40 (mh17)
- * CVS info: $Id: pipeServer.c,v 1.13 2010-01-25 12:03:32 mh17 Exp $
+ * CVS info: $Id: pipeServer.c,v 1.14 2010-01-26 13:44:38 mh17 Exp $
*-------------------------------------------------------------------
*/
@@ -568,7 +568,7 @@ static ZMapServerResponseType getFeatures(void *server_in, GData *styles, ZMapFe
{
/* SHOULD ABORT HERE.... */
setErrMsg(server,
- g_strdup_printf("zMapGFFParseLine() failed with no GError for line %d: %s",
+ g_strdup_printf("zMapGFFParseHeader() failed with no GError for line %d: %s",
zMapGFFGetLineNumber(get_features.parser), get_features.gff_line->str)) ;
ZMAPPIPESERVER_LOG(Critical, server->protocol, server->script_path,server->query,
"%s", server->last_err_msg) ;
@@ -767,7 +767,7 @@ static ZMapServerResponseType getContextSequence(void *server_in, GData *styles,
{
/* SHOULD ABORT HERE.... */
setErrMsg(server,
- g_strdup_printf("zMapGFFParseLine() failed with no GError for line %d: %s",
+ g_strdup_printf("zMapGFFParseHeader() failed with no GError for line %d: %s",
zMapGFFGetLineNumber(get_features.parser), get_features.gff_line->str)) ;
ZMAPPIPESERVER_LOG(Critical, server->protocol, server->script_path,server->query,
"%s", server->last_err_msg) ;
diff --git a/src/zmapWindow/zmapWindowMenus.c b/src/zmapWindow/zmapWindowMenus.c
index 19b582246..43ca90715 100755
--- a/src/zmapWindow/zmapWindowMenus.c
+++ b/src/zmapWindow/zmapWindowMenus.c
@@ -29,7 +29,7 @@
* HISTORY:
* Last edited: Jan 22 13:55 2010 (edgrif)
* Created: Thu Mar 10 07:56:27 2005 (edgrif)
- * CVS info: $Id: zmapWindowMenus.c,v 1.66 2010-01-22 13:56:08 edgrif Exp $
+ * CVS info: $Id: zmapWindowMenus.c,v 1.67 2010-01-26 13:44:38 mh17 Exp $
*-------------------------------------------------------------------
*/
@@ -360,7 +360,8 @@ static void dnaMenuCB(int menu_item_id, gpointer callback_data)
char *seq_name, *molecule_type = NULL, *gene_name = NULL ;
int seq_len ;
- feature = (ZMapFeature)zMapWindowCanvasItemIntervalGetObject(menu_data->item) ;
+// feature = (ZMapFeature)zMapWindowCanvasItemIntervalGetObject(menu_data->item) ;
+ feature = zMapWindowCanvasItemGetFeature(menu_data->item); // this function is used to get the feature in the function that makes this menu
context = menu_data->window->feature_context ;
--
GitLab