From 27e09f47a6a8a8d03ca041d70c5529e661ec5886 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Mon, 21 Dec 2015 11:14:30 -0500
Subject: [PATCH] gui/ocarina: Initialize settings on startup

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/Sconscript  | 2 +-
 gui/ocarina.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gui/Sconscript b/gui/Sconscript
index 06cbdc09..d847fd0b 100644
--- a/gui/Sconscript
+++ b/gui/Sconscript
@@ -4,5 +4,5 @@ Import("env")
 env.UsePackage("gtkmm-3.0")
 env.UsePackage("gstreamer-1.0")
 
-res = Glob("*.cpp") + SConscript("queue/Sconscript")
+res = Glob("*.c") + Glob("*.cpp") + SConscript("queue/Sconscript")
 Return("res")
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 5b0e6840..46adf520 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -4,6 +4,7 @@
 extern "C" {
 #include <core/core.h>
 #include <core/idle.h>
+#include <gui/settings.h>
 }
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
@@ -63,7 +64,9 @@ int main(int argc, char **argv)
 		exit(1);
 
 	gst  :: init_pre();
+
 	core_init(&argc, &argv, &init_data);
+	gui_settings_init();
 
 	gst   :: init();
 	plist :: init();