From d26cc999e93ed0d98c8ba298520421178e0da3b9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Mon, 18 Dec 2017 11:54:41 -0500
Subject: [PATCH 1/2] Update Ghoul repository Update SGCT repository

---
 ext/ghoul | 2 +-
 ext/sgct  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 52bb0bae10..38ef288aa1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 52bb0bae102b16d0fe8b5fe0575d2280ba9736e6
+Subproject commit 38ef288aa14d9ee54dbc68c77703c8638215726f
diff --git a/ext/sgct b/ext/sgct
index ee29d15894..81d1fe53b2 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit ee29d158944eed9bafbccbccdfb9856b3a96cac0
+Subproject commit 81d1fe53b26f28c244ea96536918828530069922

From 0b0ad54028abd85862b0466f963256ab92b64c0c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Mon, 18 Dec 2017 11:58:22 -0500
Subject: [PATCH 2/2] Reenable digital universe on default Fix refresh rate
 setting in configuration_helper

---
 data/scene/default.scene                             | 2 +-
 data/scene/stars/digitaluniverse/digitaluniverse.mod | 1 +
 modules/touch/include/touchmarker.h                  | 6 +++---
 scripts/configuration_helper.lua                     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/scene/default.scene b/data/scene/default.scene
index 002c73cf22..c68ee2cd9b 100644
--- a/data/scene/default.scene
+++ b/data/scene/default.scene
@@ -133,7 +133,7 @@ return {
         -- "satellites",
         
         "grids",
-        -- "digitaluniverse",
+        "digitaluniverse",
         "stars/digitaluniverse",
         "milkyway/digitaluniverse"
     }
diff --git a/data/scene/stars/digitaluniverse/digitaluniverse.mod b/data/scene/stars/digitaluniverse/digitaluniverse.mod
index 608185c013..469de18dd4 100644
--- a/data/scene/stars/digitaluniverse/digitaluniverse.mod
+++ b/data/scene/stars/digitaluniverse/digitaluniverse.mod
@@ -6,6 +6,7 @@ return {
         Renderable = {
             Type = "RenderableStars",
             File = "speck/stars.speck",
+            -- File = "speck/stars_new.speck",
             Texture = "textures/halo.png",
             ColorMap = "colorbv.cmap"
         },
diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h
index 60a601b845..6e13095115 100644
--- a/modules/touch/include/touchmarker.h
+++ b/modules/touch/include/touchmarker.h
@@ -65,9 +65,9 @@ class TouchMarker : public properties::PropertyOwner {
 
         std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 
-        GLuint _quad;
-        GLuint _vertexPositionBuffer;
-        int _numFingers;
+        GLuint _quad = 0;
+        GLuint _vertexPositionBuffer = 0;
+        int _numFingers = 0;
 };
 
 } // openspace namespace
diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua
index 036865a67b..cfb62880c3 100644
--- a/scripts/configuration_helper.lua
+++ b/scripts/configuration_helper.lua
@@ -290,7 +290,7 @@ function generateSettings(arg)
 
     local refresh = ""
     if arg["refreshRate"] then
-        refresh = "refreshRate=" .. arg["refreshRate"] .. " "
+        refresh = "refreshRate=\"" .. arg["refreshRate"] .. "\" "
     end