From ef606b92a867be124776c71e94e8e967da61599e Mon Sep 17 00:00:00 2001
From: Bastien Gorissen <bastien.gorissen@cenaero.be>
Date: Fri, 15 Jan 2010 08:25:42 +0000
Subject: [PATCH] Removes a compilation warning and a crash when gmsh was run
with the gui unavailable.
---
Common/OpenFile.cpp | 6 ++++--
Fltk/pluginWindow.cpp | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 6bafd14c69..a7da175b57 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -460,9 +460,11 @@ void OpenProject(std::string fileName)
CTX::instance()->recent_files[0] = fileName;
if (CTX::instance()->history_size < 5)
CTX::instance()->history_size++;
- FlGui::instance()->menu->fillRecentHistoryMenu();
+#if defined(HAVE_FLTK)
+ if(FlGui::available())
+ FlGui::instance()->menu->fillRecentHistoryMenu();
+#endif
}
-
CTX::instance()->lock = 0;
#if defined(HAVE_FLTK)
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index f080a709c5..87e961c0da 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -113,7 +113,7 @@ static void add_scripting(GMSH_PostPlugin *p, PView *view)
if(view){
for(int i = 0; i < p->getNbOptions(); i++){
if(p->getOption(i)->str == "iView") {
- oldIndex = p->getOption(i)->def;
+ oldIndex = (int)(p->getOption(i)->def);
p->getOption(i)->def = view->getIndex();
}
}
--
GitLab