From c9d3d4acce29e0e689681642629c40535de3e24d Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 3 Aug 2012 18:01:43 +0200 Subject: [PATCH] Changed: #1440 Fixed sheet loading checksum initialization issue --HG-- branch : build_pipeline_v3 --- .../tools/pipeline/service/module_pipeline_master.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/nel/tools/pipeline/service/module_pipeline_master.cpp b/code/nel/tools/pipeline/service/module_pipeline_master.cpp index 2dad81d3a..ab15d29b8 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_master.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_master.cpp @@ -213,7 +213,7 @@ public: CModulePipelineMasterSkel::init(this); if (PIPELINE::tryDirectTask("MASTER_INIT_SHEETS")) { - updateSheetsDatabaseStatus(CCallback(this, &CModulePipelineMaster::cbMasterInitSheets)); + updateSheetsDatabaseStatus(); } else { @@ -222,8 +222,17 @@ public: return true; } + static void dummyCallback() { } static void dummyFileStatusCallback(const std::string &/*filePath*/, const CFileStatus &/*fileStatus*/, bool /*success*/) { } + void updateSheetsDatabaseStatus() + { + std::vector sheetPaths; + sheetPaths.push_back(NLNET::IService::getInstance()->ConfigFile.getVar("WorkspaceSheetDirectory").asString()); + g_DatabaseStatus->updateDatabaseStatus(dummyCallback, dummyFileStatusCallback, sheetPaths, true, true); // relatively fast so no need to thread + PIPELINE::endedDirectTask(); + } + void updateSheetsDatabaseStatus(const CCallback &callback) { std::vector sheetPaths;