diff main/MainWindow.cpp @ 1463:f5c828d1f3e2 3.0-integration

Store/recall colours by hex name; simpler and more general (was having trouble with reloading on Mac). Also update subrepos inc PortAudio build
author Chris Cannam <cannam@all-day-breakfast.com>
date Tue, 03 Jan 2017 15:15:26 +0000
parents f5180edc5dda
children 9401d021b47b
line wrap: on
line diff
--- a/main/MainWindow.cpp	Tue Jan 03 14:34:46 2017 +0000
+++ b/main/MainWindow.cpp	Tue Jan 03 15:15:26 2017 +0000
@@ -3587,9 +3587,9 @@
         defaultColourName = tr("Bright Green");
     }
     ColourDatabase *cdb = ColourDatabase::getInstance();
-    QColor colour =
-        ((settings.value("overview-colour", cdb->getColour(defaultColourName)))
-         .value<QColor>());
+    QColor colour = QColor
+        (settings.value("overview-colour",
+                        cdb->getColour(defaultColourName).name()).toString());
     settings.endGroup();
 
     int index = cdb->getColourIndex(colour);