From fcb67be07b34315ba2158fe20680901c84e1abb3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 21 Mar 2008 17:09:06 +0000
Subject: [PATCH] fix bug in Evaluate (bad test for external view)

---
 Geo/GModelIO_MED.cpp | 4 ++--
 Plugin/Evaluate.cpp  | 6 +++---
 doc/VERSIONS         | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index 45b88d6169..6dd5463f6d 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_MED.cpp,v 1.9 2008-03-20 11:44:05 geuzaine Exp $
+// $Id: GModelIO_MED.cpp,v 1.10 2008-03-21 17:09:06 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -35,7 +35,7 @@
 #include "GModelIO_MED.h"
 
 extern "C" {
-#include "med.h"
+#include <med.h>
 }
 
 ConversionData Data::MyConversionData;
diff --git a/Plugin/Evaluate.cpp b/Plugin/Evaluate.cpp
index 777cda9c77..79396180fe 100644
--- a/Plugin/Evaluate.cpp
+++ b/Plugin/Evaluate.cpp
@@ -1,4 +1,4 @@
-// $Id: Evaluate.cpp,v 1.35 2008-03-20 11:44:13 geuzaine Exp $
+// $Id: Evaluate.cpp,v 1.36 2008-03-21 17:09:06 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -241,9 +241,9 @@ PView *GMSH_EvaluatePlugin::execute(PView *v)
 
   if(externalView >= 0){
     if(externalView < (int)PView::list.size())
-      Msg(GERROR, "View[%d] does not exist: using self", externalView);
-    else
       v2 = PView::list[externalView];
+    else
+      Msg(GERROR, "View[%d] does not exist: using self", externalView);
   }
 
   PViewDataList *data2 = getDataList(v2);
diff --git a/doc/VERSIONS b/doc/VERSIONS
index dc2a81fd21..751d6b8720 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,4 +1,7 @@
-$Id: VERSIONS,v 1.400 2008-03-01 18:49:53 geuzaine Exp $
+$Id: VERSIONS,v 1.401 2008-03-21 17:09:06 geuzaine Exp $
+
+2.1.2 (xx): new Fields interface; more work on new post-processing
+API; fixed various bugs.
 
 2.1.1 (Mar 1, 2008): small bug fixes (second order meshes, combine
 views, divide and conquer crash, ...).
-- 
GitLab