From 89eea7af85291bfce67d04e4ae9ca67661d0ce52 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 17 Nov 2002 04:15:17 +0000
Subject: [PATCH] Add missing View->Dirty check for 2D string drawing. Caused a
seg. fault if called during file merge (due to the Fl::check() triggered by a
Msg() call).
---
Graphics/Graph2D.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Graphics/Graph2D.cpp b/Graphics/Graph2D.cpp
index de10572278..f5a23d6ae4 100644
--- a/Graphics/Graph2D.cpp
+++ b/Graphics/Graph2D.cpp
@@ -1,4 +1,4 @@
-// $Id: Graph2D.cpp,v 1.22 2002-11-17 02:27:26 geuzaine Exp $
+// $Id: Graph2D.cpp,v 1.23 2002-11-17 04:15:17 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -469,7 +469,7 @@ void Draw_Text2D(void){
for(i=0;i<List_Nbr(CTX.post.list);i++){
v = (Post_View*)List_Pointer(CTX.post.list,i);
- if(v->Visible && v->DrawStrings)
+ if(v->Visible && !v->Dirty && v->DrawStrings)
Draw_Text2D3D(2, v->TimeStep, v->NbT2, v->T2D, v->T2C);
}
--
GitLab