From 75d4eeadac6cd06d6c2c704c7056387bbee31338 Mon Sep 17 00:00:00 2001
From: dnk-88 <dnk-88@localhost>
Date: Thu, 26 May 2011 13:47:58 +0300
Subject: [PATCH] Merge

---
 .../3d/object_viewer_qt/src/plugins/core/core_plugin.cpp     | 1 +
 .../src/plugins/core/search_paths_settings_page.cpp          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp
index 468c79700..92e776068 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp
@@ -66,6 +66,7 @@ bool CorePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr
 
 	generalSettings->applyGeneralSettings();
 	searchPathPage->applySearchPaths();
+	recureseSearchPathPage->applySearchPaths();
 	addAutoReleasedObject(generalSettings);
 	addAutoReleasedObject(searchPathPage);
 	addAutoReleasedObject(recureseSearchPathPage);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
index 8238ef6ff..2d7e7a24f 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
@@ -193,10 +193,11 @@ void CSearchPathsSettingsPage::writeSettings()
 	QSettings *settings = Core::ICore::instance()->settings();
 	settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
 	if (m_recurse)
-		paths = settings->value(Core::Constants::RECURSIVE_SEARCH_PATHS).toStringList();
+		settings->setValue(Core::Constants::RECURSIVE_SEARCH_PATHS, paths);
 	else
-		paths = settings->value(Core::Constants::SEARCH_PATHS).toStringList();
+		settings->setValue(Core::Constants::SEARCH_PATHS, paths);
 	settings->endGroup();
+	settings->sync();
 }
 
 void CSearchPathsSettingsPage::checkEnabledButton()