From 565c1654c27db95d325ebd486a4f1fbf363c5fae Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 24 Dec 2014 15:19:56 -0800 Subject: [PATCH] Correctly init _colorGroup --- src/QGCPalette.cc | 3 ++- src/QGCPalette.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index edc3267d1..3e3b73925 100644 --- a/src/QGCPalette.cc +++ b/src/QGCPalette.cc @@ -47,7 +47,8 @@ QColor QGCPalette::_window[QGCPalette::_cColorGroups]; QColor QGCPalette::_windowText[QGCPalette::_cColorGroups]; QGCPalette::QGCPalette(QObject* parent) : - QObject(parent) + QObject(parent), + _colorGroup(Active) { if (!_paletteLoaded) { _paletteLoaded = true; diff --git a/src/QGCPalette.h b/src/QGCPalette.h index 0ab0675cb..e07a9adfc 100644 --- a/src/QGCPalette.h +++ b/src/QGCPalette.h @@ -55,7 +55,7 @@ class QGCPalette : public QObject public: enum ColorGroup { - Disabled, + Disabled = 0, Active, Inactive }; -- 2.22.0