From 7a3506629a3211283c07dfaaaef45ebc6915fd9d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 3 Oct 2013 16:04:13 +0200 Subject: [PATCH] CColorChooser: use matching data type --- src/gui/widget/colorchooser.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index e2e060725..4269fc328 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -122,12 +122,13 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) unsigned char r_alt= *value[VALUE_R]; unsigned char g_alt= *value[VALUE_G]; unsigned char b_alt= *value[VALUE_B]; - unsigned char a_alt = (value[VALUE_ALPHA]) ? (*(value[VALUE_ALPHA])) : 0; + unsigned char a_null = 0; + unsigned char a_alt = (value[VALUE_ALPHA]) ? (*(value[VALUE_ALPHA])) : a_null; paint(); setColor(); - int selected = 0; + int selected = 0; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings ::TIMING_MENU]);