From f350ab84fd0f9b52a627306b4e6488e4f0b88dd0 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Fri, 3 Apr 2015 14:01:40 +0200
Subject: [PATCH] Fixed the lsp generation, Fixed metadata loading

---
 CMakeLists.txt                        | 10 +++++-----
 src/controller/controller_streams.cpp |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 542ff8e2..25104339 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,7 +336,7 @@ if (EXISTS "${SOURCE_DIR}/sourcery")
   add_custom_target(sourcery 
     COMMAND cp ${SOURCE_DIR}/sourcery ${BINARY_DIR}/sourcery
   )
-elseif()
+else()
   add_executable(sourcery
     src/sourcery.cpp
   )
@@ -346,8 +346,8 @@ endif()
 # Embed Code                           #
 ########################################
 add_custom_target(embedcode
-  ./sourcery ${CMAKE_CURRENT_SOURCE_DIR}/src/embed.js embed_js ${CMAKE_CURRENT_BINARY_DIR}/embed.js.h
-  DEPENDS sourcery ${CMAKE_CURRENT_SOURCE_DIR}/src/embed.js 
+  ./sourcery ${SOURCE_DIR}/src/embed.js embed_js ${BINARY_DIR}/embed.js.h
+  DEPENDS sourcery ${SOURCE_DIR}/src/embed.js 
   VERBATIM
 )
 
@@ -369,13 +369,13 @@ endforeach()
 file(READ ${SOURCE_DIR}/lsp/main.css lspCSS)
 file(READ ${SOURCE_DIR}/lsp/header.html lspHeader)
 file(READ ${SOURCE_DIR}/lsp/footer.html lspFooter)
-file(WRITE ${SOURCE_DIR}/server.html "${lspHeader}<script>${lspCode}</script><style>${lspCSS}</style>${lspFooter}")
+file(WRITE ${BINARY_DIR}/server.html "${lspHeader}<script>${lspCode}</script><style>${lspCSS}</style>${lspFooter}")
 set (lspCSS "")
 set (lspHeader "")
 set (lspFooter "")
 
 add_custom_target(localSettingsPage
-  ./sourcery ${BINARY_DIR}/server.html server_html ${CMAKE_CURRENT_BINARY_DIR}/server.html.h
+  ./sourcery ${BINARY_DIR}/server.html server_html ${BINARY_DIR}/server.html.h
   DEPENDS sourcery
   VERBATIM
 )
diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index 692bb2ac..3ea14fc2 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -131,7 +131,9 @@ namespace Controller {
           DEBUG_MSG(DLVL_INSANE, "Waiting for stream %s to open...", name.c_str());
           //wait for the stream
           {
-            IPC::sharedPage streamIndex(name, DEFAULT_META_PAGE_SIZE);
+            char streamPageName[NAME_BUFFER_SIZE];
+            snprintf(streamPageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, name.c_str());
+            IPC::sharedPage streamIndex(streamPageName, DEFAULT_META_PAGE_SIZE, false, false);
             if (!streamIndex.mapped){
               DEBUG_MSG(DLVL_INSANE, "Stream %s opening failed! Cancelling and marking as corrupt.", name.c_str());
               data["meta"].null();