From 06da8b9077bd00d6afa3afd3b8a13be21ee02100 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Tue, 20 Mar 2018 21:48:36 +0100
Subject: [PATCH] fix: dark theme being unset after toggling theme settings

---
 .../settings/theme-settings/theme-settings-d.js        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-src/scripts/settings/theme-settings/theme-settings-d.js b/app-src/scripts/settings/theme-settings/theme-settings-d.js
index 6cf5ce1428..5e965b7dd3 100644
--- a/app-src/scripts/settings/theme-settings/theme-settings-d.js
+++ b/app-src/scripts/settings/theme-settings/theme-settings-d.js
@@ -37,12 +37,14 @@
     function cleanupThemeVars() {
       // wait for var to be there
       $scope.$evalAsync(() => {
-
         vm.currentTheme = vm.currentTheme || DEFAULT_THEME;
         vm.isDarkTheme = vm.currentTheme && vm.currentTheme.indexOf('dark') > -1;
         vm.selectedTheme = vm.currentTheme && vm.currentTheme
           .replace('-theme', '')
           .replace('-dark', '');
+
+        console.log(vm.currentTheme, vm.isDarkTheme);
+
       });
     }
 
@@ -56,7 +58,7 @@
       if (value) {
         if (vm.isDarkTheme) {
           vm.currentTheme = value + '-dark';
-        } else {
+        } else if (vm.isDarkTheme === false) {
           vm.currentTheme = value + '-theme';
         }
 
@@ -75,7 +77,7 @@
               $rootScope.r.bodyClass = 'dark-theme';
             }
           }
-        } else {
+        } else if (value === false) {
           vm.currentTheme = vm.currentTheme.replace('-dark', '-theme');
           if (vm.isCurrentProjectTheme) {
             if (!vm.isBoxed) {
@@ -104,6 +106,8 @@
     });
 
     $scope.$on('$destroy', () => {
+      console.log('DESTROY');
+
       // remove watchers manually
       _.each(watchers, (watcher) => {
         watcher();