From ae0a88708bfa2e1d76181c3b309ba64bcc1ecf0d Mon Sep 17 00:00:00 2001
From: Clement Jamin <clement.jamin@inria.fr>
Date: Wed, 29 Oct 2014 15:34:01 +0100
Subject: [PATCH] Fix: a plugin may implement two interfaces

---
 Mesh_3/demo/Mesh_3/MainWindow.cpp         | 4 +++-
 Polyhedron/demo/Polyhedron/MainWindow.cpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Mesh_3/demo/Mesh_3/MainWindow.cpp b/Mesh_3/demo/Mesh_3/MainWindow.cpp
index ce38f94bc4b..e65b725ae20 100644
--- a/Mesh_3/demo/Mesh_3/MainWindow.cpp
+++ b/Mesh_3/demo/Mesh_3/MainWindow.cpp
@@ -186,7 +186,9 @@ void MainWindow::loadPlugins()
       loader.setFileName(pluginsDir.absoluteFilePath(fileName));
       QObject *obj = loader.instance();
       if(obj) {
-        if (!initPlugin(obj) && !initIOPlugin(obj))
+        bool init1 = initPlugin(obj);
+        bool init2 = initIOPlugin(obj);
+        if (!init1 && !init2)
           qdebug << "not for this program";
         else
           qdebug << "success";
diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
index 3e40df1198b..4d93000dc62 100644
--- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
+++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
@@ -453,7 +453,9 @@ void MainWindow::loadPlugins()
         QObject *obj = loader.instance();
         if(obj) {
           obj->setObjectName(name);
-          if (!initPlugin(obj) && !initIOPlugin(obj))
+          bool init1 = initPlugin(obj);
+          bool init2 = initIOPlugin(obj);
+          if (!init1 && !init2)
             qdebug << "not for this program";
           else
             qdebug << "success";