From 9391ab119a86aa0b1b882a0810394b559e33c65b Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 28 Nov 2013 13:36:56 +0100
Subject: [PATCH] default-verhalten geflickt

---
 uhr.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uhr.js b/uhr.js
index 8ca7725..ee06939 100644
--- a/uhr.js
+++ b/uhr.js
@@ -201,7 +201,7 @@ Uhr.prototype.initToggleSwitch = function(defaultValue, overrideCookie) {
 		uhr.toggle();
 	});
 	var status = $.cookie('status' + this.id);
-	if (overrideCookie && (defaultValue != undefined)) {
+	if (status == undefined || (overrideCookie && (defaultValue != undefined))) {
 		status = defaultValue;
 	}
 	if (status == undefined || status == 'undefined') {
@@ -221,7 +221,7 @@ Uhr.prototype.initLayoutSwitch = function(defaultValue, overrideCookie) {
 		uhr.setLayout(this.value);
 	});
 	var selectedLayout = $.cookie('layout' + this.id);
-	if (overrideCookie && (defaultValue != undefined)) {
+	if (selectedLayout == undefined || (overrideCookie && (defaultValue != undefined))) {
 		selectedLayout = defaultValue;
 	}
 	if (selectedLayout == undefined || selectedLayout == 'undefined') {
@@ -236,7 +236,7 @@ Uhr.prototype.initThemeSwitch = function(defaultValue, overrideCookie) {
 		uhr.setTheme(this.value);
 	});
 	var selectedTheme = $.cookie('theme' + this.id);
-	if (overrideCookie && (defaultValue != undefined)) {
+	if (selectedTheme == undefined || (overrideCookie && (defaultValue != undefined))) {
 		selectedTheme = defaultValue;
 	}
 	if (selectedTheme == undefined || selectedTheme == 'undefined') {