X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSalomeApprc_utils%2FSalomeApprc_utils.cxx;h=21b57a2eaf83183f50a2c491aa240b918b3edbcb;hb=ebd708cf895eaba26c8a9adc57f14a10a9254c53;hp=460058801ad63879a59be51e8bb89a9d9df0b0f7;hpb=b5ee1d894797950959f2f5b4490a7769892259b5;p=modules%2Fgui.git

diff --git a/src/SalomeApprc_utils/SalomeApprc_utils.cxx b/src/SalomeApprc_utils/SalomeApprc_utils.cxx
index 460058801..21b57a2ea 100644
--- a/src/SalomeApprc_utils/SalomeApprc_utils.cxx
+++ b/src/SalomeApprc_utils/SalomeApprc_utils.cxx
@@ -1,7 +1,11 @@
 #include "SalomeApprc_utils.h"
 
-void AddComponents_from_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
+void UpdateCompInfo_with_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
 {
+	// Remove module list and  module_root_dirs list
+	ResMgr->remove("launch", "user_modules");
+	ResMgr->remove("user_modules");
+
 	QFileInfoList salomexd_list = salomeappdir.entryInfoList(QStringList() << "*.salomexd",QDir::Files);
 	foreach(QFileInfo filename, salomexd_list)
     {
@@ -46,8 +50,12 @@ void AddComponents_from_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr*
     }
 }
 
-void AddComponents_from_salomemodules(const QString& salomemodules, const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
+void UpdateCompInfo_with_salomemodules(const QString& salomemodules, const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
 {
+	// Remove module list and  module_root_dirs list
+	ResMgr->remove("launch", "user_modules");
+	ResMgr->remove("user_modules");
+
 	QRegularExpression sep(":|,");
 	QStringList components_list = salomemodules.split(sep,QString::SkipEmptyParts);
 	foreach (QString comp, components_list)
@@ -61,7 +69,6 @@ void AddComponents_from_salomemodules(const QString& salomemodules, const QDir&
 		AddGuiComponent(comp, comp_root_dir, ResMgr);
 	}
 
-
 }
 void AddGuiComponent(const QString& comp, const QString& CompRoot, SUIT_ResourceMgr* ResMgr)
 {